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

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

Browse Source 
* qubesos/pr/157:
  Fixed error in detecting dvm-template having different NetVM
This commit is contained in:
Marek Marczykowski-Górecki 2019-02-26 19:50:21 +01:00
commit 94cefc9d09
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubesmanager/settings.py
View File

@ -575,6 +575,11 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
if dispvm == qubesadmin.DEFAULT: if dispvm == qubesadmin.DEFAULT:
dispvm = self.vm.property_get_default('default_dispvm') dispvm = self.vm.property_get_default('default_dispvm')
if dispvm == self.vm:
self.warn_netvm_dispvm.setVisible(False)
return
dispvm_netvm = getattr(dispvm, 'netvm', None) dispvm_netvm = getattr(dispvm, 'netvm', None)
if own_netvm == qubesadmin.DEFAULT: if own_netvm == qubesadmin.DEFAULT: