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

* qubesos/pr/82:
  Check if VM needs killing before murdering it

qubesmanager/qube_manager.py

@@ -192,7 +192,12 @@ class VmShutdownMonitor(QtCore.QObject):
                     self.tr("Wait another {0} seconds...").format(
                         self.shutdown_time / 1000))
                 if reply == 0:
-                    vm.kill()
+                    try:
+                        vm.kill()
+                    except exc.QubesVMNotStartedError:
+                        # the VM shut down while the user was thinking about
+                        # shutting it down
+                        pass
                     self.restart_vm_if_needed()
                 else:
                     self.shutdown_started = datetime.now()

test-packages/qubesadmin/exc.py

@@ -4,3 +4,6 @@
 
 class QubesException(BaseException):
     pass
+
+class QubesVMNotStartedError(BaseException):
+    pass