From b9f48f4a1d76c9cec03636363075b3e9e64cfc9f Mon Sep 17 00:00:00 2001 From: aunsane Date: Sun, 20 May 2018 21:44:13 +0300 Subject: fix merge --- plugins/MirLua/src/main.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'plugins/MirLua/src/main.cpp') diff --git a/plugins/MirLua/src/main.cpp b/plugins/MirLua/src/main.cpp index f65f6293ad..08390a557a 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,10 +25,6 @@ PLUGININFOEX pluginInfoEx = }; -CMPlugin::CMPlugin() : - PLUGIN(MODULENAME, pluginInfoEx) -{} - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfoEx; @@ -46,7 +40,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; } @@ -70,15 +64,10 @@ extern "C" int __declspec(dllexport) Load(void) nlu.szSettingsModule = MODULENAME; hNetlib = Netlib_RegisterUser(&nlu); - Proto_RegisterModule(PROTOTYPE_FILTER, MODULENAME); - - hRecvMessage = CreateHookableEvent(MODULENAME PSR_MESSAGE); - CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, FilterRecvMessage); + HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); - g_mLua = new CMLua(); - g_mLua->Load(); + g_plugin.Load(); - HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); return 0; } @@ -86,8 +75,6 @@ extern "C" int __declspec(dllexport) Load(void) extern "C" int __declspec(dllexport) Unload(void) { - delete g_mLua; - if (hNetlib) { Netlib_CloseHandle(hNetlib); hNetlib = nullptr; -- cgit v1.2.3