diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/modules.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdchat/src/main.cpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/modules.cpp b/src/core/modules.cpp index a6b6d2d9e3..5a991a6d39 100644 --- a/src/core/modules.cpp +++ b/src/core/modules.cpp @@ -137,8 +137,7 @@ int LoadDefaultModules(void) if (LoadSkinHotkeys()) return 1;
if (LoadFontserviceModule()) return 1;
if (LoadSrmmModule()) return 1;
- InitChatModule();
-
+ if (LoadChatModule()) return 1;
if (LoadDescButtonModule()) return 1;
if (LoadOptionsModule()) return 1;
if (LoadNetlibModule()) return 1;
@@ -148,7 +147,6 @@ int LoadDefaultModules(void) LoadDbAccounts(); // retrieves the account array from a database
if (LoadContactsModule()) return 1;
if (LoadContactListModule()) return 1; // prepare contact list interface
- // LoadChatModule();
if (LoadAddContactModule()) return 1;
if (LoadNewPluginsModule()) return 1; // will call Load(void) on everything, clist will load first
diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp index 18e16c34cd..95fd00ef68 100644 --- a/src/core/stdchat/src/main.cpp +++ b/src/core/stdchat/src/main.cpp @@ -262,9 +262,8 @@ extern "C" __declspec(dllexport) int Load(void) mir_getLP(&pluginInfo);
mir_getCLI();
- mir_getCI(&g_Settings);
- pci->cbModuleInfo = sizeof(MODULEINFO);
- pci->cbSession = sizeof(SESSION_INFO);
+ CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Chat module") };
+ mir_getCI(&data);
pci->OnAddUser = OnAddUser;
pci->OnNewUser = OnNewUser;
pci->OnRemoveUser = OnRemoveUser;
|