annual camila314 commit: fix file picker on mac

geode-sdk · Jan 8, 2025 · 241be1b · 241be1b
1 parent 203c819
commit 241be1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/loader/include/Geode/cocos/include/ccTypes.h b/loader/include/Geode/cocos/include/ccTypes.h
@@ -28,7 +28,11 @@ THE SOFTWARE.
 #define __CCTYPES_H__
 
 #include <string>
+
+#ifdef __cplusplus
 #include <Geode/c++stl/gdstdlib.hpp>
+#endif
+
 #include "../cocoa/CCGeometry.h"
 #include "../platform/CCGL.h"
 

diff --git a/loader/src/platform/mac/util.mm b/loader/src/platform/mac/util.mm
@@ -95,7 +95,7 @@ @implementation FileDialog
     // default path
     if (options.defaultPath) {
         auto defaultPath = [NSString stringWithUTF8String:options.defaultPath->c_str()];
-        [panel setDirectoryURL: [NSURL URLWithString: defaultPath]];
+        [panel setDirectoryURL: [NSURL fileURLWithPath: defaultPath]];
     }
 
     // other
@@ -153,8 +153,9 @@ @implementation FileDialog
 }
 
 +(void) dispatchFilePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult onCompletion:(void(^)(FileResult&&))onCompletion {
+    file::FilePickOptions optionsCopy = options;
     dispatch_async(dispatch_get_main_queue(), ^{
-        auto result = [self filePickerWithMode:mode options:options multiple:mult];
+        auto result = [self filePickerWithMode:mode options:optionsCopy multiple:mult];
         onCompletion(std::move(result));
     });
 }