Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* qubesos/pr/86:
  Do the right thing on removal of proxyVM used as dispvm_netvm
This commit is contained in:
Marek Marczykowski-Górecki 2017-01-26 04:35:38 +01:00
commit 4235f587db
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core-modules/000QubesVm.py
View File

@ -655,7 +655,10 @@ class QubesVm(object):
return self.netvm
else:
if isinstance(self._dispvm_netvm, int):
return self._collection[self._dispvm_netvm]
if self._dispvm_netvm in self._collection:
return self._collection[self._dispvm_netvm]
else:
return None
else:
return self._dispvm_netvm