Merge remote-tracking branch 'origin/pr/3'
* origin/pr/3: don't call verify_files() before start() It is called by vm.start() internally.
This commit is contained in:
commit
d412229a74
@ -1144,7 +1144,6 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def do_start_vm(vm, thread_monitor):
|
def do_start_vm(vm, thread_monitor):
|
||||||
try:
|
try:
|
||||||
vm.verify_files()
|
|
||||||
vm.start()
|
vm.start()
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
thread_monitor.set_error_msg(str(ex))
|
thread_monitor.set_error_msg(str(ex))
|
||||||
@ -1186,7 +1185,6 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
|
|||||||
def do_start_vm_tools_install(self, vm, thread_monitor):
|
def do_start_vm_tools_install(self, vm, thread_monitor):
|
||||||
prev_drive = vm.drive
|
prev_drive = vm.drive
|
||||||
try:
|
try:
|
||||||
vm.verify_files()
|
|
||||||
vm.drive = 'cdrom:dom0:/usr/lib/qubes/qubes-windows-tools.iso'
|
vm.drive = 'cdrom:dom0:/usr/lib/qubes/qubes-windows-tools.iso'
|
||||||
vm.start()
|
vm.start()
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
|
Loading…
Reference in New Issue
Block a user