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

* qubesos/pr/86: Do the right thing on removal of proxyVM used as dispvm_netvm
2017-01-26 04:35:38 +01:00 · 2017-01-26 04:35:38 +01:00 · 4235f587db
commit 4235f587db
parent 68586681fc 19e68bacf2
1 changed files with 4 additions and 1 deletions
--- a/core-modules/000QubesVm.py
+++ b/core-modules/000QubesVm.py
@ -655,7 +655,10 @@ class QubesVm(object):
            return self.netvm
        else:
            if isinstance(self._dispvm_netvm, int):
+                if  self._dispvm_netvm in self._collection:
                    return self._collection[self._dispvm_netvm]
+                else:
+                    return None
            else:
                return self._dispvm_netvm