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

[partition] Avoid crash if combobox is gone and model resets

Browse Source 
- Since the lambda is connected to the model only, it should
   check that the target combo exists as well.
This commit is contained in:
Adriaan de Groot 2019-05-31 10:56:01 +02:00
parent 2ce2b08027
commit 3bdbfe6bff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1027,7 +1027,8 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice )
connect( m_core->bootLoaderModel(), &QAbstractItemModel::modelReset, connect( m_core->bootLoaderModel(), &QAbstractItemModel::modelReset,
[ this ]() [ this ]()
{ {
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() ); if ( !m_bootloaderComboBox.isNull() )
Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
} }
); );
connect( m_core, &PartitionCoreModule::deviceReverted, this, connect( m_core, &PartitionCoreModule::deviceReverted, this,