Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/180'

Browse Source 
* origin/pr/180:
  More safeguards for a VM that started in a weird way
This commit is contained in:
Marek Marczykowski-Górecki 2019-06-06 04:15:28 +02:00
commit 09178bc00c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesmanager/qube_manager.py
View File

@ -586,7 +586,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
row_to_delete = row row_to_delete = row
qid_to_delete = qid qid_to_delete = qid
if not row_to_delete: if not row_to_delete:
return # for some reason, the VM was removed in some other way return # for some reason, the VM was removed in some other way
del self.vms_in_table[qid_to_delete] del self.vms_in_table[qid_to_delete]
self.table.removeRow(row_to_delete.name_widget.row()) self.table.removeRow(row_to_delete.name_widget.row())
@ -596,6 +596,8 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
self.vms_in_table[vm.qid].info_widget.update_vm_state() self.vms_in_table[vm.qid].info_widget.update_vm_state()
except exc.QubesPropertyAccessError: except exc.QubesPropertyAccessError:
return # the VM was deleted before its status could be updated return # the VM was deleted before its status could be updated
except KeyError: # adding the VM failed for some reason
self.on_domain_added(None, None, vm)
if vm == self.get_selected_vm(): if vm == self.get_selected_vm():
self.table_selection_changed() self.table_selection_changed()