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

* qubesos/pr/157: Fixed error in detecting dvm-template having different NetVM
QubesOS · Feb 26, 2019 · 94cefc9 · 94cefc9
2 parents 74987f6 + b31a154
commit 94cefc9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py
@@ -575,6 +575,11 @@ def check_warn_dispvmnetvm(self):
 
         if dispvm == qubesadmin.DEFAULT:
             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)
 
         if own_netvm == qubesadmin.DEFAULT: