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

[partition] Fix crash on filesystem changes when encryption is checked

Browse Source
This commit is contained in:
dalto 2024-06-23 14:39:29 -05:00
parent ea4364b8a8
commit dbad8704f5
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,8 +467,6 @@ ChoicePage::onActionChanged()
{ {
m_encryptWidget->setFilesystem( FileSystem::typeForName( m_replaceFsTypesChoiceComboBox->currentText() ) ); m_encryptWidget->setFilesystem( FileSystem::typeForName( m_replaceFsTypesChoiceComboBox->currentText() ) );
} }
m_encryptWidget->setEncryptionCheckbox( m_config->preCheckEncryption() );
} }
Device* currd = selectedDevice(); Device* currd = selectedDevice();
@ -1035,6 +1033,10 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
if ( m_enableEncryptionWidget ) if ( m_enableEncryptionWidget )
{ {
m_encryptWidget->show(); m_encryptWidget->show();
if ( m_config->preCheckEncryption() )
{
m_encryptWidget->setEncryptionCheckbox( true );
}
} }
m_previewBeforeLabel->setText( tr( "Current:", "@label" ) ); m_previewBeforeLabel->setText( tr( "Current:", "@label" ) );
m_selectLabel->setText( tr( "<strong>Select a partition to shrink, " m_selectLabel->setText( tr( "<strong>Select a partition to shrink, "
@ -1087,7 +1089,14 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
case InstallChoice::Erase: case InstallChoice::Erase:
case InstallChoice::Replace: case InstallChoice::Replace:
{ {
m_encryptWidget->setVisible( shouldShowEncryptWidget( choice ) ); if ( shouldShowEncryptWidget( choice ) )
{
m_encryptWidget->show();
if ( m_config->preCheckEncryption() )
{
m_encryptWidget->setEncryptionCheckbox( true );
}
}
m_previewBeforeLabel->setText( tr( "Current:", "@label" ) ); m_previewBeforeLabel->setText( tr( "Current:", "@label" ) );
m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame ); m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame );
m_afterPartitionBarsView->setNestedPartitionsMode( mode ); m_afterPartitionBarsView->setNestedPartitionsMode( mode );

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

@ -182,11 +182,16 @@ EncryptWidget::updateState( const bool notify )
} }
} }
m_state = state(); Encryption newState = state();
if ( newState != m_state )
{
m_state = newState;
if ( notify ) if ( notify )
{ {
Q_EMIT stateChanged( m_state ); Q_EMIT stateChanged( m_state );
} }
}
} }
void void