Call Qrexec only if necessary

Author: ben-grande

qubesmanager/settings.py

@@ -129,7 +129,7 @@ def run(self):
         for vm in vms_to_refresh:
             self.button.setText(
                 self.tr(
-                    "Refresh in progress (refreshing applications " "from {})"
+                    "Refresh in progress (refreshing applications from {})"
                 ).format(vm.name)
             )
             try:
@@ -481,7 +481,10 @@ def __init_basic_tab__(self):
             QtGui.QRegularExpressionValidator(
                 QtCore.QRegularExpression(
                     "[a-zA-Z0-9_-]*",
-                    QtCore.QRegularExpression.PatternOption.CaseInsensitiveOption,
+                    # fmt: off
+                    QtCore.QRegularExpression.
+                    PatternOption.CaseInsensitiveOption,
+                    # fmt: on
                 ),
                 None,
             )
@@ -993,13 +996,10 @@ def clone_vm(self):
 
     ######### advanced tab
 
-    def __init_advanced_tab__(self):
+    def __init_advanced_tab__(self):  # pylint: disable=too-many-statements
 
         vm_memory = getattr(self.vm, "memory", None)
         vm_maxmem = getattr(self.vm, "maxmem", None)
-        vm_preload_dispvm = int(
-            self.vm.features.get("preload-dispvm-max", 0) or 0
-        )
 
         if vm_memory is None:
             self.init_mem.setEnabled(False)
@@ -1140,7 +1140,15 @@ def __init_advanced_tab__(self):
 
         if not hasattr(self.vm, "template_for_dispvms"):
             self.dvm_template_checkbox.setEnabled(False)
+
+        if self.dvm_template_checkbox.isChecked():
+            vm_preload_dispvm = int(
+                self.vm.features.get("preload-dispvm-max", 0) or 0
+            )
+        else:
+            vm_preload_dispvm = 0
         self.preload_dispvm.setMinimum(0)
+        self.preload_dispvm.setMaximum(9999)
         self.preload_dispvm.setEnabled(self.dvm_template_checkbox.isChecked())
         self.preload_dispvm.setValue(vm_preload_dispvm)
 
@@ -1155,8 +1163,8 @@ def __init_advanced_tab__(self):
                 self.provides_network_checkbox.setEnabled(False)
                 self.provides_network_checkbox.setToolTip(
                     self.tr(
-                        "Cannot change this setting while this qube is used as a "
-                        "NetVM by the following qubes:\n"
+                        "Cannot change this setting while this qube is used as "
+                        "a NetVM by the following qubes:\n"
                     )
                     + "\n".join(domains_using)
                 )
@@ -1271,13 +1279,13 @@ def __apply_advanced_tab__(self):
             ):
                 self.vm.vcpus = self.vcpus.value()
 
-            curr_preload_dispvm = int(
-                self.vm.features.get("preload-dispvm-max", 0) or 0
-            )
             if (
                 self.dvm_template_checkbox.isChecked()
                 and self.preload_dispvm.isEnabled()
             ):
+                curr_preload_dispvm = int(
+                    self.vm.features.get("preload-dispvm-max", 0) or 0
+                )
                 preload_dispvm = self.preload_dispvm.value()
                 if preload_dispvm != curr_preload_dispvm:
                     self.vm.features["preload-dispvm-max"] = preload_dispvm
@@ -1398,7 +1406,9 @@ def include_in_balancing_changed(self, state):
         if self.include_in_balancing.isChecked():
             self.check_mem_changes()
 
-    def dvm_template_checkbox_changed(self, state):  # pylint: disable=unused-argument
+    def dvm_template_checkbox_changed(
+        self, state
+    ):  # pylint: disable=unused-argument
         self.preload_dispvm.setEnabled(self.dvm_template_checkbox.isChecked())
         if self.dvm_template_checkbox.isChecked():
             self.check_disp_changes()