Skip to content

Commit e9dcbc2

Browse files
gokhangokce-infosfergokhangokce-infosfer
committed
FIX: Mac plugin null checks added
1 parent 00cc83d commit e9dcbc2

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser‎

4.01 KB
Binary file not shown.

‎Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package/StandaloneFileBrowser.unitypackage‎

334 Bytes
Binary file not shown.

‎Plugins/MacOS/StandaloneFileBrowser/Plugin.mm‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
const char* filters,
88
bool multiselect) {
99
StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
10-
NSString* paths = [dialog dialogOpenFilePanel:[NSString stringWithUTF8String:title]
11-
directory:[NSString stringWithUTF8String:directory]
12-
filters:[NSString stringWithUTF8String:filters]
10+
NSString* paths = [dialog dialogOpenFilePanel:[NSString stringWithUTF8String:title ?: ""]
11+
directory:[NSString stringWithUTF8String:directory ?: ""]
12+
filters:[NSString stringWithUTF8String:filters ?: ""]
1313
multiselect:multiselect
1414
canChooseFiles:YES
1515
canChooseFolders:NO];
@@ -23,9 +23,9 @@ void DialogOpenFilePanelAsync(const char* title,
2323
callbackFunc cb) {
2424
asyncCallback = cb;
2525
StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
26-
[dialog dialogOpenFilePanelAsync:[NSString stringWithUTF8String:title]
27-
directory:[NSString stringWithUTF8String:directory]
28-
filters:[NSString stringWithUTF8String:filters]
26+
[dialog dialogOpenFilePanelAsync:[NSString stringWithUTF8String:title ?: ""]
27+
directory:[NSString stringWithUTF8String:directory ?: ""]
28+
filters:[NSString stringWithUTF8String:filters ?: ""]
2929
multiselect:multiselect
3030
canChooseFiles:YES
3131
canChooseFolders:NO];
@@ -35,8 +35,8 @@ void DialogOpenFilePanelAsync(const char* title,
3535
const char* directory,
3636
bool multiselect) {
3737
StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
38-
NSString* paths = [dialog dialogOpenFilePanel:[NSString stringWithUTF8String:title]
39-
directory:[NSString stringWithUTF8String:directory]
38+
NSString* paths = [dialog dialogOpenFilePanel:[NSString stringWithUTF8String:title ?: ""]
39+
directory:[NSString stringWithUTF8String:directory ?: ""]
4040
filters:[NSString stringWithUTF8String:""]
4141
multiselect:multiselect
4242
canChooseFiles:NO
@@ -50,8 +50,8 @@ void DialogOpenFolderPanelAsync(const char* title,
5050
callbackFunc cb) {
5151
asyncCallback = cb;
5252
StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
53-
[dialog dialogOpenFilePanelAsync:[NSString stringWithUTF8String:title]
54-
directory:[NSString stringWithUTF8String:directory]
53+
[dialog dialogOpenFilePanelAsync:[NSString stringWithUTF8String:title ?: ""]
54+
directory:[NSString stringWithUTF8String:directory ?: ""]
5555
filters:[NSString stringWithUTF8String:""]
5656
multiselect:multiselect
5757
canChooseFiles:NO
@@ -63,10 +63,10 @@ void DialogOpenFolderPanelAsync(const char* title,
6363
const char* defaultName,
6464
const char* filters) {
6565
StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
66-
NSString* paths = [dialog dialogSaveFilePanel:[NSString stringWithUTF8String:title]
67-
directory:[NSString stringWithUTF8String:directory]
68-
defaultName:[NSString stringWithUTF8String:defaultName]
69-
filters:[NSString stringWithUTF8String:filters]];
66+
NSString* paths = [dialog dialogSaveFilePanel:[NSString stringWithUTF8String:title ?: ""]
67+
directory:[NSString stringWithUTF8String:directory ?: ""]
68+
defaultName:[NSString stringWithUTF8String:defaultName ?: ""]
69+
filters:[NSString stringWithUTF8String:filters ?: ""]];
7070
return [paths UTF8String];
7171
}
7272

@@ -77,10 +77,10 @@ void DialogSaveFilePanelAsync(const char* title,
7777
callbackFunc cb) {
7878
asyncCallback = cb;
7979
StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
80-
[dialog dialogSaveFilePanelAsync:[NSString stringWithUTF8String:title]
81-
directory:[NSString stringWithUTF8String:directory]
82-
defaultName:[NSString stringWithUTF8String:defaultName]
83-
filters:[NSString stringWithUTF8String:filters]];
80+
[dialog dialogSaveFilePanelAsync:[NSString stringWithUTF8String:title ?: ""]
81+
directory:[NSString stringWithUTF8String:directory ?: ""]
82+
defaultName:[NSString stringWithUTF8String:defaultName ?: ""]
83+
filters:[NSString stringWithUTF8String:filters ?: ""]];
8484
}
8585

8686

‎Plugins/MacOS/StandaloneFileBrowser/StandaloneFileBrowser.xcodeproj/project.xcworkspace/xcuserdata/gokhangokce.xcuserdatad/UserInterfaceState.xcuserstate‎

28.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)