From 0ae32294171d578114a3024136bcc683d25de37e Mon Sep 17 00:00:00 2001 From: Pradeepto Bhattacharya Date: Fri, 25 May 2007 01:44:27 +0000 Subject: [PATCH] Merge ... SVN commit 645673 by wstephens: Ensure that there is a KMMainWidget before showing the config dialog, as parts of the config (identitydialog) depend on its existence. BUG#:118060 svn path=/branches/kdepim/enterprise/kdepim/; revision=668075 --- kmkernel.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kmkernel.cpp b/kmkernel.cpp index e090d2e0d..d5db57519 100644 --- a/kmkernel.cpp +++ b/kmkernel.cpp @@ -1952,6 +1952,14 @@ void KMKernel::slotShowConfigurationDialog() this, SLOT( slotConfigChanged() ) ); } + if( KMKernel::getKMMainWidget() == 0 ) + { + // ensure that there is a main widget available + // as parts of the configure dialog (identity) rely on this + // and this slot can be called when there is only a KMComposeWin showing + new KMMainWin; + } + if( mConfigureDialog->isHidden() ) mConfigureDialog->show(); else