From cf39a24da2375575d0f93b95c7ae258aae1658a7 Mon Sep 17 00:00:00 2001 From: aunsane Date: Sun, 20 May 2018 17:24:28 +0300 Subject: MirLua: no need to keep two instances of CMPlugin --- plugins/MirLua/src/main.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'plugins/MirLua/src/main.cpp') diff --git a/plugins/MirLua/src/main.cpp b/plugins/MirLua/src/main.cpp index f65f6293ad..b38ed43347 100644 --- a/plugins/MirLua/src/main.cpp +++ b/plugins/MirLua/src/main.cpp @@ -3,8 +3,6 @@ int &hLangpack(g_plugin.m_hLang); CMPlugin g_plugin; -CMLua *g_mLua; - HANDLE g_hCLibsFolder; HANDLE g_hScriptsFolder; @@ -27,9 +25,9 @@ PLUGININFOEX pluginInfoEx = }; -CMPlugin::CMPlugin() : +/*CMPlugin::CMPlugin() : PLUGIN(MODULENAME, pluginInfoEx) -{} +{}*/ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { @@ -46,7 +44,7 @@ int OnOptionsInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Services"); odp.szTitle.w = L"Lua"; odp.szTab.w = LPGENW("Scripts"); - odp.pDialog = new CMLuaOptions(g_mLua); + odp.pDialog = new CMLuaOptions(); Options_AddPage(wParam, &odp); return 0; } @@ -75,8 +73,7 @@ extern "C" int __declspec(dllexport) Load(void) hRecvMessage = CreateHookableEvent(MODULENAME PSR_MESSAGE); CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, FilterRecvMessage); - g_mLua = new CMLua(); - g_mLua->Load(); + g_plugin.Load(); HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); return 0; @@ -86,7 +83,7 @@ extern "C" int __declspec(dllexport) Load(void) extern "C" int __declspec(dllexport) Unload(void) { - delete g_mLua; + g_plugin.Unload(); if (hNetlib) { Netlib_CloseHandle(hNetlib); -- cgit v1.2.3