napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure a default bootloader location is set.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-01-29 17:43:55 +01:00
parent 7f235525f2
commit ec5a464eda
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/partition/gui/ChoicePage.cpp
View File

@ -546,6 +546,9 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current,
[=] [=]
{ {
setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() ); setNextEnabled( !m_beforePartitionBarsView->selectionModel()->selectedRows().isEmpty() );
if ( !m_bootloaderComboBox.isNull() &&
m_bootloaderComboBox->currentIndex() < 0 )
m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex );
}, this ); }, this );
} }
@ -713,9 +716,7 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
connect( m_core, &PartitionCoreModule::deviceReverted, connect( m_core, &PartitionCoreModule::deviceReverted,
this, [ this ]( Device* dev ) this, [ this ]( Device* dev )
{ {
if ( dev && if ( !m_bootloaderComboBox.isNull() )
dev == selectedDevice() &&
!m_bootloaderComboBox.isNull() )
{ {
if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() )
m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); m_bootloaderComboBox->setModel( m_core->bootLoaderModel() );