From f4258bb6d37d16a673c268376e0dff1958c34f82 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Fri, 23 Oct 2015 22:27:49 +0000 Subject: MirLua: - m_core is available as usual module - options page moved to Services/MirLua/Scripts - code cleaning - version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@15602 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirLua/src/mlua_script_loader.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'plugins/MirLua/src/mlua_script_loader.cpp') diff --git a/plugins/MirLua/src/mlua_script_loader.cpp b/plugins/MirLua/src/mlua_script_loader.cpp index 34ee40256c..9f83d6b9cb 100644 --- a/plugins/MirLua/src/mlua_script_loader.cpp +++ b/plugins/MirLua/src/mlua_script_loader.cpp @@ -27,7 +27,16 @@ void CLuaScriptLoader::LoadScript(const TCHAR *scriptDir, const TCHAR *file, int CMLuaScript *script = new CMLuaScript(L, path, iGroup); g_mLua->Scripts.insert(script); - if (db_get_b(NULL, MODULE, _T2A(file), 1) && script->Load()) + TCHAR buf[4096]; + if (db_get_b(NULL, MODULE, _T2A(file), 1) == FALSE) + { + + mir_sntprintf(buf, _T("%s:PASS"), path); + CallService(MS_NETLIB_LOGW, (WPARAM)hNetlib, (LPARAM)buf); + return; + } + + if (script->Load()) { TCHAR buf[4096]; mir_sntprintf(buf, _T("%s:OK"), path); @@ -51,9 +60,11 @@ void CLuaScriptLoader::LoadScripts(const TCHAR *scriptDir, int iGroup) if (hFind != INVALID_HANDLE_VALUE) { do - if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - LoadScript(scriptDir, fd.cFileName, iGroup); - while (FindNextFile(hFind, &fd)); + { + if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + continue; + LoadScript(scriptDir, fd.cFileName, iGroup); + } while (FindNextFile(hFind, &fd)); FindClose(hFind); } } -- cgit v1.2.3