Fixed incorrect default dispvm settings
Fixed error in DispVM selection in VM settings fixes QubesOS/qubes-issues#3565
This commit is contained in:
		
							parent
							
								
									82323ca5ed
								
							
						
					
					
						commit
						8da0d35110
					
				@ -572,7 +572,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
 | 
				
			|||||||
            self.kernel_groupbox.setVisible(True)
 | 
					            self.kernel_groupbox.setVisible(True)
 | 
				
			||||||
            self.kernel_list, self.kernel_idx = utils.prepare_kernel_choice(
 | 
					            self.kernel_list, self.kernel_idx = utils.prepare_kernel_choice(
 | 
				
			||||||
                self.kernel, self.vm, 'kernel',
 | 
					                self.kernel, self.vm, 'kernel',
 | 
				
			||||||
                self.vm.app.default_kernel,
 | 
					                None,
 | 
				
			||||||
                allow_default=True, allow_none=True)
 | 
					                allow_default=True, allow_none=True)
 | 
				
			||||||
            self.kernel.currentIndexChanged.connect(self.kernel_changed)
 | 
					            self.kernel.currentIndexChanged.connect(self.kernel_changed)
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
@ -588,8 +588,8 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
 | 
				
			|||||||
                utils.prepare_vm_choice(
 | 
					                utils.prepare_vm_choice(
 | 
				
			||||||
                    self.default_dispvm,
 | 
					                    self.default_dispvm,
 | 
				
			||||||
                    self.vm, 'default_dispvm',
 | 
					                    self.vm, 'default_dispvm',
 | 
				
			||||||
                    self.vm.app.default_dispvm,
 | 
					                    None,
 | 
				
			||||||
                    (lambda vm: vm.klass == 'DispVM'),
 | 
					                    (lambda vm: getattr(vm, 'template_for_dispvms', False)),
 | 
				
			||||||
                    allow_default=True, allow_none=True)
 | 
					                    allow_default=True, allow_none=True)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.update_virt_mode_list()
 | 
					        self.update_virt_mode_list()
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user