StatusManager: #662

- ability to disable subplugins
- project cleaning

3 files changed, 7 insertions, 3 deletions

diff --git a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
index f975b64793..1cc209f0c7 100644
--- a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
@@ -19,6 +19,8 @@
 
 #include "..\stdafx.h"
 
+int hKSLangpack = 0;
+
 struct TimerInfo {
 	int timer;
 	int timeout;
@@ -1214,6 +1216,9 @@ int KSModuleLoaded(WPARAM, LPARAM)
 
 void KeepStatusLoad()
 {
+	MUUID muidLast = MIID_LAST;
+	hKSLangpack = GetPluginLangId(muidLast, 0);
+
 	hKSModuleLoadedHook = HookEvent(ME_SYSTEM_MODULESLOADED, KSModuleLoaded);
 
 	CreateHookableEvent(ME_KS_CONNECTIONEVENT);
@@ -1237,9 +1242,6 @@ void KeepStatusUnload()
 	DestroyServiceFunction(hIsProtoEnabled);
 	DestroyServiceFunction(hAnnounceStat);
 
-	if (hMainThread)
-		CloseHandle(hMainThread);
-
 	DestroyHookableEvent(hConnectionEvent);
 
 	UnhookEvent(hKSModuleLoadedHook);
diff --git a/plugins/StatusManager/src/KeepStatus/keepstatus.h b/plugins/StatusManager/src/KeepStatus/keepstatus.h
index 18e13f242c..167bb1a051 100644
--- a/plugins/StatusManager/src/KeepStatus/keepstatus.h
+++ b/plugins/StatusManager/src/KeepStatus/keepstatus.h
@@ -20,6 +20,7 @@
 #ifndef __KEEPSTATUS_HEADER
 #define __KEEPSTATUS_HEADER
 
+extern int hKSLangpack;
 
 #define KSMODULENAME                 "KeepStatus"
 #define SETTING_CHECKCONNECTION      "CheckConnection"
diff --git a/plugins/StatusManager/src/KeepStatus/ks_options.cpp b/plugins/StatusManager/src/KeepStatus/ks_options.cpp
index 0f321dfd14..1a4d6075b8 100644
--- a/plugins/StatusManager/src/KeepStatus/ks_options.cpp
+++ b/plugins/StatusManager/src/KeepStatus/ks_options.cpp
@@ -567,6 +567,7 @@ int KeepStatusOptionsInit(WPARAM wparam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.hInstance = hInst;
+	odp.hLangpack = hKSLangpack;
 	odp.szGroup.w = LPGENW("Status");
 	odp.szTitle.w = LPGENW("Keep status");
 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;