From 7caa88c9bb1479e2ea362e5d65c607588cf21fd9 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Mon, 16 Nov 2015 05:02:42 +0100 Subject: [PATCH] CLuaInstance: Executing 'zapit leave standby' only when script... ...is terminated with an error Complement to commit 94e11ad2a01ec5932226991e6dff6a75ca2b02b9 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/09881321e2ceaaa6d40cfce529851f722ab97c13 Author: Michael Liebmann Date: 2015-11-16 (Mon, 16 Nov 2015) ------------------ This commit was generated by Migit --- src/gui/luainstance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/luainstance.cpp b/src/gui/luainstance.cpp index 6ea65173d..c8d82164d 100644 --- a/src/gui/luainstance.cpp +++ b/src/gui/luainstance.cpp @@ -475,8 +475,8 @@ void CLuaInstance::runScript(const char *fileName, std::vector *arg DisplayErrorMessage(lua_tostring(lua, -1), "Lua Script Error:"); if (error_string) *error_string = std::string(lua_tostring(lua, -1)); + g_Zapit->setStandby(false); } - g_Zapit->setStandby(false); } // Example: runScript(fileName, "Arg1", "Arg2", "Arg3", ..., NULL);