fixes duplicate contacts in Facebook & ICQ, when a modal dialog blocks Miranda's start

3 files changed, 4 insertions, 3 deletions

diff --git a/src/mir_app/src/database.cpp b/src/mir_app/src/database.cpp
index 630d8f9aab..2d7f07dd70 100644
--- a/src/mir_app/src/database.cpp
+++ b/src/mir_app/src/database.cpp
@@ -481,6 +481,7 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 	}

 

 	InitCryptMenuItem(mi);

+	InitStaticAccounts();

 	return 0;

 }

 

diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h
index da93858769..737535f48c 100644
--- a/src/mir_app/src/miranda.h
+++ b/src/mir_app/src/miranda.h
@@ -185,6 +185,8 @@ void UnloadAccount(PROTOACCOUNT *pa, int flags);
 void LoadDbAccounts(void);

 void WriteDbAccounts(void);

 

+void InitStaticAccounts();

+

 void KillModuleAccounts(HINSTANCE);

 

 INT_PTR CallProtoServiceInt(MCONTACT hContact, const char* szModule, const char* szService, WPARAM wParam, LPARAM lParam);

diff --git a/src/mir_app/src/proto_accs.cpp b/src/mir_app/src/proto_accs.cpp
index f6f08a420e..4e2be22d74 100644
--- a/src/mir_app/src/proto_accs.cpp
+++ b/src/mir_app/src/proto_accs.cpp
@@ -164,7 +164,7 @@ static int OnEventEdited(WPARAM hContact, LPARAM hDbEvent)
 	return 0;
 }
 
-static int InitializeStaticAccounts(WPARAM, LPARAM)
+void InitStaticAccounts()
 {
 	int count = 0;
 
@@ -190,7 +190,6 @@ static int InitializeStaticAccounts(WPARAM, LPARAM)
 		CallService(MS_PROTO_SHOWACCMGR, 0, 0);
 		db_unset(0, "FirstRun", "ForceShowAccManager");
 	}
-	return 0;
 }
 
 static int UninitializeStaticAccounts(WPARAM, LPARAM)
@@ -225,7 +224,6 @@ int LoadAccountsModule(void)
 			pa->bDynDisabled = true;
 	}
 
-	hHooks[0] = HookEvent(ME_SYSTEM_MODULESLOADED, InitializeStaticAccounts);
 	hHooks[1] = HookEvent(ME_SYSTEM_PRESHUTDOWN, UninitializeStaticAccounts);
 	hHooks[2] = HookEvent(ME_DB_CONTACT_DELETED, OnContactDeleted);
 	hHooks[3] = HookEvent(ME_DB_EVENT_EDITED, OnEventEdited);