Fixed Windows file dialog crash

Anuken · Aug 23, 2024 · aafecc8 · aafecc8
1 parent e020cc5
commit aafecc8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/extensions/filedialogs/src/arc/filedialogs/FileDialogs.java b/extensions/filedialogs/src/arc/filedialogs/FileDialogs.java
@@ -48,7 +48,7 @@ public static void loadNatives() throws UnsatisfiedLinkError{
 	        env->ReleaseStringChars(obj_defaultPathAndFile, defaultPathAndFile);
 	        env->ReleaseStringChars(obj_filterDescription, filterDescription);
 
-            return env->NewString((jchar*)result, wcslen(result));
+            return result == NULL ? NULL : env->NewString((jchar*)result, wcslen(result));
         #else
             char* title = (char*)env->GetStringUTFChars(obj_title, 0);
             char* defaultPathAndFile = (char*)env->GetStringUTFChars(obj_defaultPathAndFile, 0);
@@ -110,7 +110,7 @@ public static void loadNatives() throws UnsatisfiedLinkError{
 	        env->ReleaseStringChars(obj_defaultPathAndFile, defaultPathAndFile);
 	        env->ReleaseStringChars(obj_filterDescription, filterDescription);
 
-            return env->NewString((jchar*)result, wcslen(result));
+            return result == NULL ? NULL : env->NewString((jchar*)result, wcslen(result));
 
         #else
         	char* title = (char*)env->GetStringUTFChars(obj_title, 0);

diff --git a/natives/natives-filedialogs/libs/arc-filedialogs.dll b/natives/natives-filedialogs/libs/arc-filedialogs.dll
diff --git a/natives/natives-filedialogs/libs/arc-filedialogs64.dll b/natives/natives-filedialogs/libs/arc-filedialogs64.dll