diff options
| -rw-r--r-- | src/gui/kconfiggui.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp index f65bba59..7eb4711e 100644 --- a/src/gui/kconfiggui.cpp +++ b/src/gui/kconfiggui.cpp @@ -39,7 +39,7 @@ KConfig *KConfigGui::sessionConfig() #ifdef QT_NO_SESSIONMANAGER #error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support. #endif - if (!hasSessionConfig()) { + if (!hasSessionConfig() && qApp->isSessionRestored()) { // create the default instance specific config object // from applications' -session command line parameter s_sessionConfig = new KConfig(configName(qApp->sessionId(), @@ -70,6 +70,10 @@ bool KConfigGui::hasSessionConfig() #if KCONFIGGUI_BUILD_DEPRECATED_SINCE(5, 11) QString KConfigGui::sessionConfigName() { - return sessionConfig()->name(); + if (sessionConfig()) { + return sessionConfig()->name(); + } else { + return QString(); + } } #endif |