about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--src/lua.c6
-rw-r--r--src/teliva.c6
-rw-r--r--src/teliva.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lua.c b/src/lua.c
index fab1ce3..b853226 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -243,8 +243,12 @@ static int pmain (lua_State *L) {
   lua_gc(L, LUA_GCRESTART, 0);
   s->status = handle_luainit(L);
   if (s->status != 0) return 0;
-  s->status = handle_image(L, argv, 1);
+  s->status = load_image(L, argv, 1);
   if (s->status != 0) return 0;
+  /* call main() */
+  lua_getglobal(L, "spawn_main");
+  s->status = docall(L, 0, 1);
+  if (s->status != 0) return report_in_developer_mode(L, s->status);
   return 0;
 }
 
diff --git a/src/teliva.c b/src/teliva.c
index db59428..2de3fb3 100644
--- a/src/teliva.c
+++ b/src/teliva.c
@@ -1783,7 +1783,7 @@ static const char* events_view() {
 char* Image_name = NULL;
 extern void set_args (lua_State *L, char **argv, int n);
 extern void load_tlv(lua_State* L, char* filename);
-int handle_image(lua_State* L, char** argv, int n) {
+int load_image(lua_State* L, char** argv, int n) {
   int status;
   set_args(L, argv, n);
   /* parse and load file contents (teliva_program array) */
@@ -1800,9 +1800,5 @@ int handle_image(lua_State* L, char** argv, int n) {
   clear_caller(L);
   /* initialize permissions */
   load_permissions_from_user_configuration(L);
-  /* call main() */
-  lua_getglobal(L, "spawn_main");
-  status = docall(L, 0, 1);
-  if (status != 0) return report_in_developer_mode(L, status);
   return 0;
 }
diff --git a/src/teliva.h b/src/teliva.h
index e322aa3..34a6724 100644
--- a/src/teliva.h
+++ b/src/teliva.h
@@ -152,7 +152,7 @@ enum color_pair {
 /* Integrate with Lua VM */
 extern char** Argv;
 extern char* Previous_message;
-extern int handle_image(lua_State* L, char** argv, int n);
+extern int load_image(lua_State* L, char** argv, int n);
 extern void developer_mode(lua_State* L);
 extern void permissions_mode(lua_State* L);
 extern int file_operation_permitted(const char* caller, const char* filename, const char* mode);