Browse Source

qubes/vm/dispvm: don't crash when DispVM is already killed

This is regression of QubesOS/qubes-issues#1660

Fixes QubesOS/qubes-issues#1660
Marek Marczykowski-Górecki 7 years ago
parent
commit
3b209515c2
1 changed files with 4 additions and 1 deletions
  1. 4 1
      qubes/vm/dispvm.py

+ 4 - 1
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()