From ec5a464edaf5f13eea99e327bd4e7c00fd609e22 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 29 Jan 2016 17:43:55 +0100 Subject: [PATCH] Make sure a default bootloader location is set. --- src/modules/partition/gui/ChoicePage.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index aace251d4..89b7cdd0a 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -546,6 +546,9 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current, [=] { setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() ); + if ( !m_bootloaderComboBox.isNull() && + m_bootloaderComboBox->currentIndex() < 0 ) + m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); }, this ); } @@ -713,9 +716,7 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) connect( m_core, &PartitionCoreModule::deviceReverted, this, [ this ]( Device* dev ) { - if ( dev && - dev == selectedDevice() && - !m_bootloaderComboBox.isNull() ) + if ( !m_bootloaderComboBox.isNull() ) { if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) m_bootloaderComboBox->setModel( m_core->bootLoaderModel() );