From e95be8a8edec9cc6cd96f5b659340cdc2e045693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Tue, 13 Feb 2018 20:26:55 +0100
Subject: [PATCH] Is this bug finally dead

Yet another attempt at stomp this zombie monstrosity.

fixes QubesOS/qubes-issues#3570
---
 qubesmanager/qube_manager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py
index 7559db5..bc1d0f9 100755
--- a/qubesmanager/qube_manager.py
+++ b/qubesmanager/qube_manager.py
@@ -192,7 +192,7 @@ class VmShutdownMonitor(QtCore.QObject):
                     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 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
 
         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!"),