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

Fixed errors with virt mode choice

Browse Source 
Current virtualization mode wasn't displayed correctly. It should work now.

fixes QubesOS/qubes-issues#3517
This commit is contained in:
Marta Marczykowska-Górecka 2018-02-06 15:31:17 +01:00
parent 82323ca5ed
commit 2be8f8bcea
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesmanager/settings.py
View File

@ -631,7 +631,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
try: try:
if self.virt_mode.currentIndex() != self.virt_mode_idx: if self.virt_mode.currentIndex() != self.virt_mode_idx:
self.vm.virt_mode = self.selected_virt_mode().lower() self.vm.virt_mode = self.selected_virt_mode()
except Exception as ex: # pylint: disable=broad-except except Exception as ex: # pylint: disable=broad-except
msg.append(str(ex)) msg.append(str(ex))

2
qubesmanager/utils.py
View File

@ -60,6 +60,8 @@ def prepare_choice(widget, holder, propname, choice, default,
oldvalue = qubesadmin.DEFAULT oldvalue = qubesadmin.DEFAULT
else: else:
oldvalue = getattr(holder, propname) oldvalue = getattr(holder, propname)
if transform is not None and oldvalue is not None:
oldvalue = transform(oldvalue)
else: else:
oldvalue = object() # won't match for identity oldvalue = object() # won't match for identity
idx = 0 idx = 0