From 6c5f50c246062bcb50a20efe7951be7e23449ca0 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 23 May 2011 19:20:56 +0200
Subject: COMMON: Add exit() to list of forbidden symbols

---
 engines/sword25/util/lua/loslib.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/sword25/util/lua/loslib.cpp')

diff --git a/engines/sword25/util/lua/loslib.cpp b/engines/sword25/util/lua/loslib.cpp
index c46aea59bd..b61f8c65e1 100644
--- a/engines/sword25/util/lua/loslib.cpp
+++ b/engines/sword25/util/lua/loslib.cpp
@@ -18,6 +18,7 @@
 #include "lualib.h"
 
 #include "common/system.h"
+#include "common/textconsole.h"
 
 
 static int os_execute (lua_State *L) {
@@ -214,10 +215,9 @@ static int os_exit (lua_State *L) {
   // Using OSystem::quit() isn't really a great idea, either.
   // We really would prefer to let the main run loop exit, so that
   // our main() can perform cleanup.
-  g_system->quit();
-  // leave the exit call in there for now, in case some of our
-  // OSystem::quit applications are incorrect... *sigh*
-  exit(luaL_optint(L, 1, EXIT_SUCCESS));
+  if (0 == luaL_optint(L, 1, EXIT_SUCCESS))
+	  g_system->quit();
+  error("LUA os_exit invokes with non-zero exit value");
 }
 
 static const luaL_Reg syslib[] = {
-- 
cgit v1.2.3