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

Rewrite without cascade var

Browse Source
This commit is contained in:
donoban 2021-01-27 09:30:21 +01:00
parent c943e2dd84
commit 28120f3a8f
No known key found for this signature in database
GPG Key ID: 141310D8E3ED08A5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubesmanager/qube_manager.py
View File

@ -1249,7 +1249,6 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QMainWindow):
def shutdown_vm(self, vm, shutdown_time=vm_shutdown_timeout, def shutdown_vm(self, vm, shutdown_time=vm_shutdown_timeout,
check_time=vm_restart_check_timeout, and_restart=False): check_time=vm_restart_check_timeout, and_restart=False):
try: try:
cascade = False
connected_vms = [x for x in vm.connected_vms if x.is_running()] connected_vms = [x for x in vm.connected_vms if x.is_running()]
if len(connected_vms) > 0: if len(connected_vms) > 0:
@ -1264,12 +1263,13 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QMainWindow):
if reply != QMessageBox.Yes: if reply != QMessageBox.Yes:
return False return False
cascade = True
for connected_vm in connected_vms: for connected_vm in connected_vms:
if not self.shutdown_vm(connected_vm): if not self.shutdown_vm(connected_vm):
return False return False
vm.shutdown(force=cascade) vm.shutdown(force=True)
else:
vm.shutdown()
except exc.QubesException as ex: except exc.QubesException as ex:
QMessageBox.warning( QMessageBox.warning(
self, self,