Skip to content

Commit 241be1b

Browse files
committed
annual camila314 commit: fix file picker on mac
1 parent 203c819 commit 241be1b

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

loader/include/Geode/cocos/include/ccTypes.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ THE SOFTWARE.
2828
#define __CCTYPES_H__
2929

3030
#include <string>
31+
32+
#ifdef __cplusplus
3133
#include <Geode/c++stl/gdstdlib.hpp>
34+
#endif
35+
3236
#include "../cocoa/CCGeometry.h"
3337
#include "../platform/CCGL.h"
3438

loader/src/platform/mac/util.mm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ @implementation FileDialog
9595
// default path
9696
if (options.defaultPath) {
9797
auto defaultPath = [NSString stringWithUTF8String:options.defaultPath->c_str()];
98-
[panel setDirectoryURL: [NSURL URLWithString: defaultPath]];
98+
[panel setDirectoryURL: [NSURL fileURLWithPath: defaultPath]];
9999
}
100100

101101
// other
@@ -153,8 +153,9 @@ @implementation FileDialog
153153
}
154154

155155
+(void) dispatchFilePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult onCompletion:(void(^)(FileResult&&))onCompletion {
156+
file::FilePickOptions optionsCopy = options;
156157
dispatch_async(dispatch_get_main_queue(), ^{
157-
auto result = [self filePickerWithMode:mode options:options multiple:mult];
158+
auto result = [self filePickerWithMode:mode options:optionsCopy multiple:mult];
158159
onCompletion(std::move(result));
159160
});
160161
}

0 commit comments

Comments
 (0)