Fix #1018 issue with 2nd level folder rename in the gtkui and save resume data on file/folder renamed

deluge/core/torrentmanager.py

@@ -962,6 +962,7 @@ class TorrentManager(component.Component):
                     # This is the last alert we were waiting for, time to send signal
                     component.get("EventManager").emit(TorrentFolderRenamedEvent(torrent_id, wait_on_folder[0], wait_on_folder[1]))
                     del torrent.waiting_on_folder_rename[i]
+                    self.save_resume_data((torrent_id,))
                     break
                 # This isn't the last file to be renamed in this folder, so just
                 # remove the index and continue
@@ -970,6 +971,7 @@ class TorrentManager(component.Component):
         if not folder_rename:
             # This is just a regular file rename so send the signal
             component.get("EventManager").emit(TorrentFileRenamedEvent(torrent_id, alert.index, alert.name))
+            self.save_resume_data((torrent_id,))
 
     def on_alert_metadata_received(self, alert):
         log.debug("on_alert_metadata_received")

deluge/ui/gtkui/files_tab.py

@@ -741,7 +741,7 @@ class FilesTab(Tab):
             new_folder_iter = self.get_iter_at_path(new_folder)
             if len(new_split) == len(old_split):
                 # These are at the same tree depth, so it's a simple rename
-                self.treestore[old_folder_iter][0] = new_folder
+                self.treestore[old_folder_iter][0] = new_split[-1] + "/"
                 return
             if new_folder_iter:
                 # This means that a folder by this name already exists