Author: andar

Revision: 5898

Log:
        Fix crash when removing multiple torrents

Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog   2009-10-31 00:08:53 UTC (rev 5897)
+++ branches/1.2_RC/ChangeLog   2009-10-31 05:50:01 UTC (rev 5898)
@@ -8,6 +8,7 @@
        * Replace & with & in the details tab to ensure there are no markup 
errors
        * Consider 0 unlimited when displaying limits in the statusbar
        * Fix adding torrents when not showing the add torrent dialog in Windows
+       * Fix crash when removing multiple torrents
 
 ==== Web ====
        * Fix #1046 changing auto managed via the details tab

Modified: branches/1.2_RC/deluge/ui/gtkui/removetorrentdialog.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/removetorrentdialog.py      2009-10-31 
00:08:53 UTC (rev 5897)
+++ branches/1.2_RC/deluge/ui/gtkui/removetorrentdialog.py      2009-10-31 
05:50:01 UTC (rev 5898)
@@ -83,11 +83,12 @@
             button_data.set_label(pluralize_torrents(button_data.get_label()))
 
     def __remove_torrents(self, remove_data):
-        for torrent_id in self.__torrent_ids:
-            client.core.remove_torrent(torrent_id, remove_data)
         # Unselect all to avoid issues with the selection changed event
         component.get("TorrentView").treeview.get_selection().unselect_all()
 
+        for torrent_id in self.__torrent_ids:
+            client.core.remove_torrent(torrent_id, remove_data)
+
     def run(self):
         """
         Shows the dialog and awaits for user input.  The user can select to

Modified: trunk/deluge/ui/gtkui/removetorrentdialog.py
===================================================================
--- trunk/deluge/ui/gtkui/removetorrentdialog.py        2009-10-31 00:08:53 UTC 
(rev 5897)
+++ trunk/deluge/ui/gtkui/removetorrentdialog.py        2009-10-31 05:50:01 UTC 
(rev 5898)
@@ -83,11 +83,12 @@
             button_data.set_label(pluralize_torrents(button_data.get_label()))
 
     def __remove_torrents(self, remove_data):
-        for torrent_id in self.__torrent_ids:
-            client.core.remove_torrent(torrent_id, remove_data)
         # Unselect all to avoid issues with the selection changed event
         component.get("TorrentView").treeview.get_selection().unselect_all()
 
+        for torrent_id in self.__torrent_ids:
+            client.core.remove_torrent(torrent_id, remove_data)
+
     def run(self):
         """
         Shows the dialog and awaits for user input.  The user can select to



--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to