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

[keyboard] Avoid crash with unconfigured keyboards

Browse Source 
- If there's no items at all, ->currentItem() can return nullptr,
   so don't dereference that.

Found on FreeBSD.
This commit is contained in:
Adriaan de Groot 2019-04-18 12:56:56 +02:00
parent fd5097c466
commit b704933b58
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/keyboard/KeyboardPage.cpp
View File

@ -216,11 +216,11 @@ QString
KeyboardPage::prettyStatus() const
{
QString status;
status += tr( "Set keyboard model to %1.<br/>" )
.arg( ui->comboBoxModel->currentText() );
status += tr( "Set keyboard layout to %1/%2." )
.arg( ui->listLayout->currentIndex().data().toString() )
.arg( ui->listVariant->currentItem()->text() );
status += tr( "Set keyboard model to %1.<br/>" ).arg( ui->comboBoxModel->currentText() );
QString layout = ui->listLayout->currentIndex().data().toString();
QString variant = ui->listVariant->currentItem() ? ui->listVariant->currentItem()->text() : QString( "<default>" );
status += tr( "Set keyboard layout to %1/%2." ).arg( layout, variant );
return status;
}