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

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

Browse Source 
* qubesos/pr/69:
  Is this bug finally dead
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-22 18:12:47 +01:00
commit e5c5fb67c7
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesmanager/qube_manager.py
View File

@ -192,7 +192,7 @@ class VmShutdownMonitor(QtCore.QObject):
self.tr("Wait another {0} seconds...").format( self.tr("Wait another {0} seconds...").format(
self.shutdown_time / 1000)) self.shutdown_time / 1000))
if reply == 0: if reply == 0:
vm.force_shutdown() vm.kill()
self.restart_vm_if_needed() self.restart_vm_if_needed()
else: else:
self.shutdown_started = datetime.now() self.shutdown_started = datetime.now()
@ -841,7 +841,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
if reply == QtGui.QMessageBox.Yes: if reply == QtGui.QMessageBox.Yes:
try: try:
vm.force_shutdown() vm.kill()
except exc.QubesException as ex: except exc.QubesException as ex:
QtGui.QMessageBox.critical( QtGui.QMessageBox.critical(
None, self.tr("Error while killing Qube!"), None, self.tr("Error while killing Qube!"),