openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File r893741.diff of Package kdepim4

Subject: korganizer: robustness work in synchronous address book loading
From: wstephenson@suse.de
Bug: 
Patch-upstream: 893741
--- korganizer/koprefs.cpp	(revision 893740)
+++ korganizer/koprefs.cpp	(revision 893741)
@@ -87,9 +87,6 @@ KOPrefs::KOPrefs() :
   agendaTimeLabelsFontItem()->setDefaultValue( mDefaultAgendaTimeLabelsFont );
   monthViewFontItem()->setDefaultValue( mDefaultMonthViewFont );
   agendaCalendarItemsEventsBackgroundColorItem()->setDefaultValue( mDefaultCategoryColor );
-
-  // Load it now, not deep within some painting code
-  mMyAddrBookMails = KABC::StdAddressBook::self()->whoAmI().emails();
 }
 
 KOPrefs::~KOPrefs()
@@ -101,6 +98,14 @@ KOPrefs *KOPrefs::instance()
 {
   if ( !mInstance ) {
     insd.setObject( mInstance, new KOPrefs() );
+
+    // Load it now, not deep within some painting code
+    // Don't load inside constructor since synchronous loading could
+    // require resources to do a nested eventloop or similar and
+    // cause re-entrance, resulting in more than once call to KOPrefs::instance()
+    // before the constructor has finished and thus create more than once instance
+    mInstance->mMyAddrBookMails = KABC::StdAddressBook::self()->whoAmI().emails();
+
     mInstance->readConfig();
   }
 
Index: korganizer/koprefs.cpp
===================================================================

Places

File r893741.diff of Package kdepim4

Places