From 5a8fd3ceab614eab3922d2fd133dbc20248f17bf Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 1 Aug 2026 22:32:49 +0300
Subject: [PATCH] update sub-instance lifetime

---
 src/engine/Engine.cpp                   | 1 +
 src/logic/scripting/lua/libs/libapp.cpp | 8 ++++++--
 src/main.cpp                            | 2 +-
 src/util/platform.cpp                   | 6 ++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 0baa102fc..f0e20f922 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -413,6 +413,7 @@ void Engine::onWorldClosed() {
 }
 
 void Engine::quit() {
+    logger.info() << "quitSignal set to true";
     quitSignal = true;
     if (!isHeadless()) {
         window->setShouldClose(true);
diff --git a/src/logic/scripting/lua/libs/libapp.cpp b/src/logic/scripting/lua/libs/libapp.cpp
index 771567fd4..4d932c272 100644
--- a/src/logic/scripting/lua/libs/libapp.cpp
+++ b/src/logic/scripting/lua/libs/libapp.cpp
@@ -22,6 +22,10 @@
 
 using namespace scripting;
 
+namespace {
+    static std::unique_ptr<Process> sub_instance = nullptr;
+}
+
 /// @brief Check if content is loaded
 static int l_is_content_loaded(lua::State* L) {
     return lua::pushboolean(L, content != nullptr);
@@ -377,7 +381,7 @@ static int l_start_background_instance(lua::State* L) {
     const auto& paths = engine->getPaths();
 
     std::vector<std::string> args {
-        "--headless",
+        // "--headless",
         "--res", paths.getResourcesFolder().u8string(),
         "--dir", paths.getUserFilesFolder().u8string(),
         "--script", io::resolve(scriptPath).u8string(),
@@ -385,7 +389,7 @@ static int l_start_background_instance(lua::State* L) {
     args.emplace_back("--project");
     args.emplace_back(io::resolve(engine->getProject().path).u8string());
 
-    platform::new_engine_instance(
+    ::sub_instance = platform::new_engine_instance(
         std::move(args),
         outputPath.empty() ? "" : io::resolve(outputPath),
         true 
diff --git a/src/main.cpp b/src/main.cpp
index 098d72a70..2438d5f50 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,7 +10,7 @@
 static debug::Logger logger("main");
 
 static void sigterm_handler(int signum) {
-    logger.info() << "SIGTERM received";
+    logger.info() << "SIGTERM received " << signum;
     Engine::getInstance().quit();
 }
 
diff --git a/src/util/platform.cpp b/src/util/platform.cpp
index e0b2587b7..7b08639e9 100644
--- a/src/util/platform.cpp
+++ b/src/util/platform.cpp
@@ -296,7 +296,8 @@ public:
 
     void terminate() final override {
 #ifdef __linux__
-        kill(pid, SIGKILL);
+        logger.info() << "terminating " << pid;
+        kill(pid, SIGTERM);
 #elif defined(_WIN32)
         if (processHandle != nullptr) {
             TerminateProcess(processHandle, 1);
@@ -461,10 +462,11 @@ std::unique_ptr<Process> platform::new_engine_instance(
             _exit(127);
         } else {
             close(fd);
+            usleep(1000); // waiting for execvp call
             return std::make_unique<SystemProcess>(pid);
         }
     }
-#endif // __APPLE_
+#endif
 
     std::stringstream ss;
     ss << executable;