From 37144248085bc1788cde90ddfa8aa1fd967056d5 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Mon, 15 Jan 2018 21:12:40 -0600 Subject: [PATCH] deps/obs-scripting: Set current_lua_script earlier to prevent a crash --- deps/obs-scripting/obs-scripting-lua.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/obs-scripting/obs-scripting-lua.c b/deps/obs-scripting/obs-scripting-lua.c index 29189f56f..90947820e 100644 --- a/deps/obs-scripting/obs-scripting-lua.c +++ b/deps/obs-scripting/obs-scripting-lua.c @@ -103,6 +103,8 @@ static bool load_lua_script(struct obs_lua_script *data) goto fail; } + current_lua_script = data; + add_lua_source_functions(script); add_hook_functions(script); #if UI_ENABLED @@ -163,8 +165,6 @@ static bool load_lua_script(struct obs_lua_script *data) else data->save = LUA_REFNIL; - current_lua_script = data; - lua_getglobal(script, "script_defaults"); if (lua_isfunction(script, -1)) { ls_push_libobs_obj(obs_data_t, data->base.settings, false);