From 3b209515c27203ea6b72786cc898402ea4311462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 4 Nov 2016 13:25:09 +0100
Subject: [PATCH] qubes/vm/dispvm: don't crash when DispVM is already killed

This is regression of QubesOS/qubes-issues#1660

Fixes QubesOS/qubes-issues#1660
---
 qubes/vm/dispvm.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qubes/vm/dispvm.py b/qubes/vm/dispvm.py
index 8cec62b1..78124c2b 100644
--- a/qubes/vm/dispvm.py
+++ b/qubes/vm/dispvm.py
@@ -162,7 +162,10 @@ class DispVM(qubes.vm.qubesvm.QubesVM):
         '''
         app = qubes.Qubes(self.app.store)
         self = app.domains[self.uuid]
-        self.force_shutdown()
+        try:
+            self.force_shutdown()
+        except qubes.exc.QubesVMNotStartedError:
+            pass
         self.remove_from_disk()
         del app.domains[self]
         app.save()