Fixed bug 3594

Incorrect targetVM display - dom0 was not included, and the code erroneously assumed that not only it is included, but also it's always the first in the dropdown. No more assumptions. fixes QubesOS/qubes-issues#3594
QubesOS · Feb 20, 2018 · dc0f8c0 · dc0f8c0
1 parent 3967d92
commit dc0f8c0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/qubesmanager/backup.py b/qubesmanager/backup.py
@@ -101,8 +101,10 @@ def __init__(self, qt_app, qubes_app, parent=None):
             self.qubes_app,
             None,
             self.qubes_app.domains['dom0'],
-            (lambda vm: vm.klass != 'TemplateVM' and vm.is_running()),
-            allow_internal=False,
+            filter_function=(lambda vm:
+                             vm.klass != 'TemplateVM'
+                             and vm.is_running()
+                             and not vm.features.get('internal', False)),
             allow_default=False,
             allow_none=False
         )
@@ -236,7 +238,7 @@ def validateCurrentPage(self):
                     None, self.tr("Wait!"),
                     self.tr("Enter backup target location first."))
                 return False
-            if self.appvm_combobox.currentIndex() == 0 \
+            if self.appvm_combobox.currentText() == "dom0" \
                     and not os.path.isdir(backup_location):
                 QtGui.QMessageBox.information(
                     None, self.tr("Wait!"),