3 files changed, 1 insertions, 11 deletions
diff --git a/plugins/Clist_nicer/src/Include/config.h b/plugins/Clist_nicer/src/Include/config.h
index 2869b9e52e..c833107fe3 100644
--- a/plugins/Clist_nicer/src/Include/config.h
+++ b/plugins/Clist_nicer/src/Include/config.h
@@ -50,8 +50,6 @@ private:
 class cfg
 {
 public:
-	static void    init();
-
    static DWORD   getDword(const MCONTACT hContact, const char *szModule, const char *szSetting, DWORD uDefault);
    static DWORD   getDword(const char *szModule, const char *szSetting, DWORD uDefault);
    static DWORD   getDword(const char *szSetting, DWORD uDefault);
diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp
index 214082dced..185affedf0 100644
--- a/plugins/Clist_nicer/src/config.cpp
+++ b/plugins/Clist_nicer/src/config.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 TCluiData cfg::dat = {0};
 ClcData* cfg::clcdat = 0;
 
-static CRITICAL_SECTION cachecs;
+static mir_cs cachecs;
 LIST<TExtraCache> cfg::arCache(100, LIST<TExtraCache>::FTSortFunc(NumericKeySortT));
 
 bool cfg::shutDown = false;
@@ -47,11 +47,6 @@ int     API::exLine = 0;
 bool    API::exAllowContinue = false;
 HMODULE API::hDwm = 0;
 
-void cfg::init()
-{
-	InitializeCriticalSection(&cachecs);
-}
-
 DWORD cfg::getDword(const MCONTACT hContact = 0, const char *szModule = 0, const char *szSetting = 0, DWORD uDefault = 0)
 {
 	return ((DWORD)db_get_dw(hContact, szModule, szSetting, uDefault));
@@ -198,7 +193,6 @@ void CSH_Destroy()
 	}
 
 	cfg::arCache.destroy();
-	DeleteCriticalSection(&cachecs);
 }
 
 void API::onInit()
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index a9eef79489..f2c3b197ec 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -189,8 +189,6 @@ extern "C" int __declspec(dllexport) CListInitialise()
 	if (iCount < 300)
 		iCount = 300;
 
-	cfg::init();
-
 	cfg::dat.hMenuNotify = CreatePopupMenu();
 	cfg::dat.wNextMenuID = 1;
 	cfg::dat.sortTimer = cfg::getDword("CLC", "SortTimer", 150);