Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/66'

Browse Source 
* qubesos/pr/66:
  Fixed incorrect default dispvm settings
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-10 23:35:12 +01:00
commit 83936ba93e
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubesmanager/settings.py
View File

@ -570,7 +570,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
self.kernel_groupbox.setVisible(True) self.kernel_groupbox.setVisible(True)
self.kernel_list, self.kernel_idx = utils.prepare_kernel_choice( self.kernel_list, self.kernel_idx = utils.prepare_kernel_choice(
self.kernel, self.vm, 'kernel', self.kernel, self.vm, 'kernel',
self.vm.app.default_kernel, None,
allow_default=True, allow_none=True) allow_default=True, allow_none=True)
self.kernel.currentIndexChanged.connect(self.kernel_changed) self.kernel.currentIndexChanged.connect(self.kernel_changed)
else: else:
@ -586,8 +586,8 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
utils.prepare_vm_choice( utils.prepare_vm_choice(
self.default_dispvm, self.default_dispvm,
self.vm, 'default_dispvm', self.vm, 'default_dispvm',
self.vm.app.default_dispvm, None,
(lambda vm: vm.klass == 'DispVM'), (lambda vm: getattr(vm, 'template_for_dispvms', False)),
allow_default=True, allow_none=True) allow_default=True, allow_none=True)
self.update_virt_mode_list() self.update_virt_mode_list()