Merge pull request #2 from DreamRealityInteractive/feature/shutdown_f…

…rom_script Shutdown imgui from a script final() function
DreamRealityInteractive · Nov 10, 2023 · 1695463 · 1695463
2 parents b564cfc + c6c87c6
commit 1695463
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/netimgui/api/netimgui.script_api b/netimgui/api/netimgui.script_api
@@ -28,6 +28,11 @@
   - name: disconnect
     type: function
 
+#*****************************************************************************************************
+
+  - name: shutdown
+    type: function
+
 #*****************************************************************************************************
 
   - name: is_connected

diff --git a/netimgui/netimgui.script b/netimgui/netimgui.script
@@ -26,6 +26,8 @@ function init(self)
 end
 
 function final(self)
+	netimgui.shutdown()
+
 	if self.acquire_input_focus then
 		msg.post(".", "release_input_focus")
 	end

diff --git a/netimgui/src/extension_netimgui.cpp b/netimgui/src/extension_netimgui.cpp
@@ -24,7 +24,6 @@ static int netimgui_ConnectToApp(lua_State *L)
 static int netimgui_ConnectFromApp(lua_State *L)
 {
     DM_LUA_STACK_CHECK(L, 0);
-    //imgui_NewFrame();
     const char* client_name = luaL_checkstring(L, 1);
     NetImgui::ConnectFromApp(client_name);
     return 0;
@@ -33,11 +32,17 @@ static int netimgui_ConnectFromApp(lua_State *L)
 static int netimgui_Disconnect(lua_State *L)
 {
     DM_LUA_STACK_CHECK(L, 0);
-    //imgui_NewFrame();
     NetImgui::Disconnect();
     return 0;
 }
 
+static int netimgui_Shutdown(lua_State *L)
+{
+    DM_LUA_STACK_CHECK(L, 0);
+    NetImgui::Shutdown();
+    return 0;
+}
+
 static int netimgui_IsConnected(lua_State *L)
 {
     DM_LUA_STACK_CHECK(L, 1);
@@ -55,6 +60,7 @@ static const luaL_reg Module_methods[] =
     {"connect_to_app", netimgui_ConnectToApp},
     {"disconnect", netimgui_Disconnect},
     {"is_connected", netimgui_IsConnected},
+    {"shutdown", netimgui_Shutdown},
     {0, 0}
 };
 
@@ -91,7 +97,9 @@ dmExtension::Result AppFinalizeDefoldNetImGui(dmExtension::AppParams* params)
 dmExtension::Result FinalizeDefoldNetImGui(dmExtension::Params* params)
 {
     dmLogInfo("FinalizeDefoldNetImGui");
-    NetImgui::Shutdown();
+    // Shutdown is now triggered from netimgui.script, to avoid a crash 
+    // from a presumed race condition with imgui shutdown
+    //NetImgui::Shutdown();
     return dmExtension::RESULT_OK;
 }