Merge branch 'master' into master

timothyschoen · web-flow · commit 2f8849257e5a · 2024-10-04T01:55:58.000+02:00
diff --git a/pdlua.c b/pdlua.c
@@ -1365,7 +1365,7 @@ static int pdlua_object_new(lua_State *L)
   * */
 {
     PDLUA_DEBUG("pdlua_object_new: stack top is %d", lua_gettop(L));
-    if (lua_islightuserdata(L, 1))
+    if (lua_islightuserdata(L, 1) && lua_islightuserdata(L, 2))
     {
         t_class *c = lua_touserdata(L, 1);
         t_class *c_gfx = lua_touserdata(L, 2);
@@ -2998,8 +2998,8 @@ void pdlua_setup(void)
             result = lua_pcall(__L(), 0, 0, 0);
             PDLUA_DEBUG ("pdlua lua_pcall returned %d", result);
         }
-
-        if (lua_load(__L(), pdlua_reader, &reader, "pd.lua", NULL) || lua_pcall(__L(), 0, 0, 0))
+      
+        if (0 != result)
         {
             mylua_error(__L(), NULL, NULL);
             pd_error(NULL, "lua: loader will not be registered!");

Original file line number	Diff line number	Diff line change
`@@ -1365,7 +1365,7 @@ static int pdlua_object_new(lua_State *L)`
`1365`	`1365`	`* */`
`1366`	`1366`	`{`
`1367`	`1367`	`PDLUA_DEBUG("pdlua_object_new: stack top is %d", lua_gettop(L));`
`1368`		`- if (lua_islightuserdata(L, 1))`
	`1368`	`+ if (lua_islightuserdata(L, 1) && lua_islightuserdata(L, 2))`
`1369`	`1369`	`{`
`1370`	`1370`	`t_class *c = lua_touserdata(L, 1);`
`1371`	`1371`	`t_class *c_gfx = lua_touserdata(L, 2);`
`@@ -2998,8 +2998,8 @@ void pdlua_setup(void)`
`2998`	`2998`	`result = lua_pcall(__L(), 0, 0, 0);`
`2999`	`2999`	`PDLUA_DEBUG ("pdlua lua_pcall returned %d", result);`
`3000`	`3000`	`}`
`3001`		`-`
`3002`		`- if (lua_load(__L(), pdlua_reader, &reader, "pd.lua", NULL) \|\| lua_pcall(__L(), 0, 0, 0))`
	`3001`	`+`
	`3002`	`+ if (0 != result)`
`3003`	`3003`	`{`
`3004`	`3004`	`mylua_error(__L(), NULL, NULL);`
`3005`	`3005`	`pd_error(NULL, "lua: loader will not be registered!");`