From 8da0d35110049cf190b2c7beb75508444832595c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Sat, 10 Feb 2018 22:54:00 +0100 Subject: [PATCH] Fixed incorrect default dispvm settings Fixed error in DispVM selection in VM settings fixes QubesOS/qubes-issues#3565 --- qubesmanager/settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index 838fa3f..f9cbaf9 100755 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -572,7 +572,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): self.kernel_groupbox.setVisible(True) self.kernel_list, self.kernel_idx = utils.prepare_kernel_choice( self.kernel, self.vm, 'kernel', - self.vm.app.default_kernel, + None, allow_default=True, allow_none=True) self.kernel.currentIndexChanged.connect(self.kernel_changed) else: @@ -588,8 +588,8 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog): utils.prepare_vm_choice( self.default_dispvm, self.vm, 'default_dispvm', - self.vm.app.default_dispvm, - (lambda vm: vm.klass == 'DispVM'), + None, + (lambda vm: getattr(vm, 'template_for_dispvms', False)), allow_default=True, allow_none=True) self.update_virt_mode_list()