From b704933b582127058a0158bbfc2c5f1ace160fa3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 18 Apr 2019 12:56:56 +0200 Subject: [PATCH] [keyboard] Avoid crash with unconfigured keyboards - If there's no items at all, ->currentItem() can return nullptr, so don't dereference that. Found on FreeBSD. --- src/modules/keyboard/KeyboardPage.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp index 3a0da2866..4509a5dbd 100644 --- a/src/modules/keyboard/KeyboardPage.cpp +++ b/src/modules/keyboard/KeyboardPage.cpp @@ -216,12 +216,12 @@ QString KeyboardPage::prettyStatus() const { QString status; - status += tr( "Set keyboard model to %1.
" ) - .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.
" ).arg( ui->comboBoxModel->currentText() ); + + QString layout = ui->listLayout->currentIndex().data().toString(); + QString variant = ui->listVariant->currentItem() ? ui->listVariant->currentItem()->text() : QString( "" ); + status += tr( "Set keyboard layout to %1/%2." ).arg( layout, variant ); + return status; }