Restore file in model when renaming failed.

src/core/model/fileproxymodel.h

@@ -170,6 +170,12 @@ public:
    */
   bool rmdir(const QModelIndex& index) const;
 
+  /**
+   * Initialize tagged file for model index.
+   * @param index model index
+   */
+  void initTaggedFileData(const QModelIndex& index);
+
   /**
    * Get tagged file data of model index.
    *
@@ -277,12 +283,6 @@ private:
    */
   void clearTaggedFileStore();
 
-  /**
-   * Initialize tagged file for model index.
-   * @param index model index
-   */
-  void initTaggedFileData(const QModelIndex& index);
-
   QHash<QPersistentModelIndex, TaggedFile*> m_taggedFiles;
   QSet<QPersistentModelIndex> m_filteredOut;
   TaggedFileIconProvider* m_iconProvider;

src/gui/forms/kid3mainwindow.cpp

@@ -1925,6 +1925,7 @@ void Kid3MainWindow::renameFile()
           i18n("Error while renaming:\n") +
           i18n("Rename %1 to %2 failed\n").arg(fileName).arg(newFileName),
           QMessageBox::Ok, Qt::NoButton);
+        model->initTaggedFileData(index);
       }
     }
   }