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

Don't wait!

Browse Source
This commit is contained in:
donoban 2021-01-26 23:47:14 +01:00
parent 696a668bbe
commit c943e2dd84
No known key found for this signature in database
GPG Key ID: 141310D8E3ED08A5
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qubesmanager/qube_manager.py
View File

@ -22,7 +22,6 @@
# #
# #
import subprocess import subprocess
import time
from datetime import datetime, timedelta from datetime import datetime, timedelta
from functools import partial from functools import partial
from os import path from os import path
@ -1250,7 +1249,9 @@ 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:
reply = QMessageBox.question( reply = QMessageBox.question(
self, self.tr("Qube Shutdown Confirmation"), self, self.tr("Qube Shutdown Confirmation"),
@ -1260,19 +1261,15 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QMainWindow):
", ".join([x.name for x in connected_vms])), ", ".join([x.name for x in connected_vms])),
QMessageBox.Yes | QMessageBox.Cancel) QMessageBox.Yes | QMessageBox.Cancel)
if reply == QMessageBox.Yes: if reply != QMessageBox.Yes:
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
with common_threads.busy_cursor(): vm.shutdown(force=cascade)
for connected_vm in connected_vms:
while connected_vm.is_running():
time.sleep(0.5)
else:
return False
vm.shutdown()
except exc.QubesException as ex: except exc.QubesException as ex:
QMessageBox.warning( QMessageBox.warning(
self, self,