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:
Marek Marczykowski-Górecki 2015-10-08 03:38:25 +02:00
commit d412229a74
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -1144,7 +1144,6 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
@staticmethod
def do_start_vm(vm, thread_monitor):
try:
vm.verify_files()
vm.start()
except Exception as 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):
prev_drive = vm.drive
try:
vm.verify_files()
vm.drive = 'cdrom:dom0:/usr/lib/qubes/qubes-windows-tools.iso'
vm.start()
except Exception as ex: