Fixed crash when opening in-game text editor

FoundryMC · Nov 12, 2024 · c990f38 · c990f38
1 parent 8147db3
commit c990f38
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/common/src/main/java/foundry/veil/Veil.java b/common/src/main/java/foundry/veil/Veil.java
@@ -42,6 +42,17 @@ public static void init() {
         VeilMolang.set(MolangCompiler.create(MolangCompiler.DEFAULT_FLAGS, Veil.class.getClassLoader()));
     }
 
+    /**
+     * Runs the specified code with the correct ImGui context.
+     *
+     * @param task The ImGui task to run
+     */
+    public static void withImGui(Runnable task) {
+        beginImGui();
+        task.run();
+        endImGui();
+    }
+
     /**
      * <p>Enables writing ImGui to the screen. This useful for debugging during the normal render loop.</p>
      * <p>Be sure to call {@link #endImGui()} when done.</p>

diff --git a/common/src/main/java/foundry/veil/api/client/imgui/CodeEditor.java b/common/src/main/java/foundry/veil/api/client/imgui/CodeEditor.java
@@ -1,5 +1,6 @@
 package foundry.veil.api.client.imgui;
 
+import foundry.veil.Veil;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.extension.texteditor.TextEditor;
@@ -59,7 +60,7 @@ public void save() {
         if (errors.isEmpty()) {
             this.oldSource = this.editor.getText();
         }
-        this.editor.setErrorMarkers(errors);
+        Veil.withImGui(() -> this.editor.setErrorMarkers(errors));
     }
 
     /**
@@ -73,8 +74,10 @@ public void show(@Nullable String fileName, String source) {
         this.oldSource = this.editor.getText();
         this.editor.setErrorMarkers(Collections.emptyMap());
         this.open.set(true);
-        ImGui.setWindowFocus("###editor");
-        ImGui.setWindowCollapsed("###editor", false);
+        Veil.withImGui(() -> {
+            ImGui.setWindowFocus("###editor");
+            ImGui.setWindowCollapsed("###editor", false);
+        });
     }
 
     /**
@@ -83,9 +86,11 @@ public void show(@Nullable String fileName, String source) {
     public void hide() {
         if (this.hasTextChanged()) {
             this.open.set(true);
-            ImGui.pushID(this.hashCode());
-            ImGui.openPopup("###save_confirm");
-            ImGui.popID();
+            Veil.withImGui(() -> {
+                ImGui.pushID(this.hashCode());
+                ImGui.openPopup("###save_confirm");
+                ImGui.popID();
+            });
         } else {
             this.oldSource = null;
             this.open.set(false);