Fix rare corruption of ini filename on exit

pkdawson · Jun 29, 2024 · 9b1a46f · 9b1a46f
1 parent 2aaef1d
commit 9b1a46f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/gdext/src/Context.cpp b/gdext/src/Context.cpp
@@ -187,14 +187,13 @@ void RebuildFontAtlas()
 void SetIniFilename(const String& fn)
 {
     ImGuiIO& io = ImGui::GetIO();
-    static std::vector<char> iniFilename;
     if (fn.length() > 0)
     {
         std::string globalfn = ProjectSettings::get_singleton()->globalize_path(fn).utf8().get_data();
-        iniFilename.resize(globalfn.length() + 1);
-        std::copy(globalfn.begin(), globalfn.end(), iniFilename.begin());
-        iniFilename.back() = '\0';
-        io.IniFilename = iniFilename.data();
+        ctx->iniFilename.resize(globalfn.length() + 1);
+        std::copy(globalfn.begin(), globalfn.end(), ctx->iniFilename.begin());
+        ctx->iniFilename.back() = '\0';
+        io.IniFilename = ctx->iniFilename.data();
     }
     else
         io.IniFilename = nullptr;

diff --git a/gdext/src/Context.h b/gdext/src/Context.h
@@ -53,6 +53,7 @@ struct Context
     Vector2i viewportSize;
     ImGuiLayer* layer = nullptr;
     bool inProcessFrame = false;
+    std::vector<char> iniFilename;
 
     Context(std::unique_ptr<Renderer> r);
     ~Context();