Merge remote-tracking branch 'qubesos/pr/67'
* qubesos/pr/67: Boot from device window fix
This commit is contained in:
		
						commit
						b3699d27d5
					
				| @ -70,6 +70,8 @@ class VMBootFromDeviceWindow(ui_bootfromdevice.Ui_BootDialog, QtGui.QDialog): | |||||||
| 
 | 
 | ||||||
|         qvm_start.main(['--cdrom', cdrom_location, self.vm.name]) |         qvm_start.main(['--cdrom', cdrom_location, self.vm.name]) | ||||||
| 
 | 
 | ||||||
|  |         self.done(0) | ||||||
|  | 
 | ||||||
|     def __warn_if_running__(self): |     def __warn_if_running__(self): | ||||||
|         if self.vm.is_running(): |         if self.vm.is_running(): | ||||||
|             QtGui.QMessageBox.warning( |             QtGui.QMessageBox.warning( | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Marek Marczykowski-Górecki
						Marek Marczykowski-Górecki