Merge remote-tracking branch 'qubesos/pr/70'
* qubesos/pr/70: Allow restarting auto_cleanup=False DispVMs
This commit is contained in:
commit
a141e40e9c
3
qubesmanager/qube_manager.py
Executable file → Normal file
3
qubesmanager/qube_manager.py
Executable file → Normal file
@ -500,7 +500,8 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
|
|||||||
and vm.klass != 'AdminVM')
|
and vm.klass != 'AdminVM')
|
||||||
self.action_restartvm.setEnabled(
|
self.action_restartvm.setEnabled(
|
||||||
vm.is_running() and vm.get_power_state() != "Paused"
|
vm.is_running() and vm.get_power_state() != "Paused"
|
||||||
and vm.klass != 'AdminVM' and vm.klass != 'DispVM')
|
and vm.klass != 'AdminVM'
|
||||||
|
and (vm.klass != 'DispVM' or not vm.auto_cleanup))
|
||||||
self.action_killvm.setEnabled(
|
self.action_killvm.setEnabled(
|
||||||
(vm.get_power_state() == "Paused" or vm.is_running())
|
(vm.get_power_state() == "Paused" or vm.is_running())
|
||||||
and vm.klass != 'AdminVM')
|
and vm.klass != 'AdminVM')
|
||||||
|
Loading…
Reference in New Issue
Block a user