Protect agains messed up plamashell config

In case the config was written before 5b8f8bd12, a malformed value is written

Otherwise plasmashell could not be started at all
wilder-5.24
Alexander Lohnau 5 years ago
parent 5b8f8bd12e
commit 368143329e
No known key found for this signature in database
GPG Key ID: 1F58708D54A003E7
  1. 6
      shell/shellcorona.cpp

@ -2128,7 +2128,11 @@ QString ShellCorona::defaultShell()
{
KSharedConfig::Ptr startupConf = KSharedConfig::openConfig(QStringLiteral("plasmashellrc"));
KConfigGroup startupConfGroup(startupConf, "Shell");
return startupConfGroup.readEntry("ShellPackage", qEnvironmentVariable("PLASMA_DEFAULT_SHELL", "org.kde.plasma.desktop"));
const QString defaultValue = qEnvironmentVariable("PLASMA_DEFAULT_SHELL", "org.kde.plasma.desktop");
QString value = startupConfGroup.readEntry("ShellPackage", defaultValue);
// In the global theme an empty value was written, make sure we still return a shell package
return value.isEmpty() ? defaultValue : value;
}
void ShellCorona::refreshCurrentShell()

Loading…
Cancel
Save