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

* qubesos/pr/69: Is this bug finally dead
QubesOS · Feb 22, 2018 · e5c5fb6 · e5c5fb6
2 parents 33e77d6 + e95be8a
commit e5c5fb6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py
@@ -192,7 +192,7 @@ def check_if_vm_has_shutdown(self):
                     self.tr("Wait another {0} seconds...").format(
                         self.shutdown_time / 1000))
                 if reply == 0:
-                    vm.force_shutdown()
+                    vm.kill()
                     self.restart_vm_if_needed()
                 else:
                     self.shutdown_started = datetime.now()
@@ -841,7 +841,7 @@ def action_killvm_triggered(self):
 
         if reply == QtGui.QMessageBox.Yes:
             try:
-                vm.force_shutdown()
+                vm.kill()
             except exc.QubesException as ex:
                 QtGui.QMessageBox.critical(
                     None, self.tr("Error while killing Qube!"),