Fix bug with VM Settings

Bug related to previous fixes to 'apply'; part of the code still
incorrectly assumed some attributes may not exist

fixes QubesOS/qubes-issues#4866
This commit is contained in:
Marta Marczykowska-Górecka 2019-03-09 16:45:22 +01:00
parent b424a7486d
commit e556c8f848
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B

View File

@ -855,7 +855,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
def update_virt_mode_list(self): def update_virt_mode_list(self):
choices = ['HVM', 'PV'] choices = ['HVM', 'PV']
if hasattr(self, 'dev_list'): if self.dev_list:
devs_attached = self.dev_list.selected_list.count() != 0 devs_attached = self.dev_list.selected_list.count() != 0
else: else:
devs_attached = bool(list(self.vm.devices['pci'].persistent())) devs_attached = bool(list(self.vm.devices['pci'].persistent()))
@ -866,7 +866,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
choices.insert(0, 'PVH') choices.insert(0, 'PVH')
self.pvh_mode_hidden.hide() self.pvh_mode_hidden.hide()
if hasattr(self, 'virt_mode_list'): if self.virt_mode_list:
old_mode = self.selected_virt_mode() old_mode = self.selected_virt_mode()
self.virt_mode.currentIndexChanged.disconnect() self.virt_mode.currentIndexChanged.disconnect()
else: else: