Merge branch 'master' into multiuser

2011-04-22 11:44:10 +01:00 · 2011-04-22 11:44:10 +01:00 · 342da12d0c
parent 233e814547 5296fc7d4c
commit 342da12d0c
1 changed files with 7 additions and 1 deletions
--- a/deluge/ui/gtkui/listview.py
+++ b/deluge/ui/gtkui/listview.py
@ -622,7 +622,13 @@ class ListView:
                # Column is not visible, no need to reposition
                continue

-            column_at_position = columns[col_state.position]
+            try:
+                column_at_position = columns[col_state.position]
+            except IndexError:
+                # While updating the multiuser branch, which adds a new column
+                # an IndexError was raised, just continue processing, once
+                # deluge is restarted, it all should be good
+                continue
            if col_state.name == column_at_position.get_title():
                # It's in the right position
                continue