Merge remote-tracking branch 'origin/pr/170'

* origin/pr/170: Fix error on reverting Qube Manager to an older version
marmarta · Apr 3, 2019 · f4d0417 · f4d0417
2 parents 0cdbda5 + d2ad60e
commit f4d0417
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py
@@ -626,8 +626,16 @@ def load_manager_settings(self):
         self.sort_order = QtCore.Qt.SortOrder(
             self.manager_settings.value("view/sort_order",
                                         defaultValue=self.sort_order))
-        self.table.sortItems(self.columns_indices[self.sort_by_column],
-                             self.sort_order)
+
+        try:
+            self.table.sortItems(self.columns_indices[self.sort_by_column],
+                                 self.sort_order)
+        except KeyError:
+            # the manager was sorted on a column that does not exist in the
+            # current version; possible only with downgrades
+            self.table.sortItems(self.columns_indices["Name"],
+                                 self.sort_order)
+
         if not self.manager_settings.value("view/menubar_visible",
                                            defaultValue=True):
             self.action_menubar.setChecked(False)