[ui] filter for cursor styles available on the current system to avoi…

…d NPEs in CursorAdapter#dispose (fixes #301)
wisp-forest · Sep 15, 2024 · 5235a88 · 5235a88
1 parent a2a5b0f
commit 5235a88
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/io/wispforest/owo/ui/util/CursorAdapter.java b/src/main/java/io/wispforest/owo/ui/util/CursorAdapter.java
@@ -20,7 +20,10 @@ public class CursorAdapter {
     protected CursorAdapter(long windowHandle) {
         this.windowHandle = windowHandle;
         for (var style : ACTIVE_STYLES) {
-            this.cursors.put(style, GLFW.glfwCreateStandardCursor(style.glfw));
+            var pointer = GLFW.glfwCreateStandardCursor(style.glfw);
+            if (pointer == 0) continue;
+
+            this.cursors.put(style, pointer);
         }
     }
 
@@ -42,7 +45,7 @@ public void applyStyle(CursorStyle style) {
         if (style == CursorStyle.NONE) {
             GLFW.glfwSetCursor(this.windowHandle, 0);
         } else {
-            GLFW.glfwSetCursor(this.windowHandle, this.cursors.get(style));
+            GLFW.glfwSetCursor(this.windowHandle, this.cursors.getOrDefault(style, 0L));
         }
         this.lastCursorStyle = style;
     }