FIX: Mac plugin null checks added

gkngkc · Sep 20, 2017 · e9dcbc2 · e9dcbc2
1 parent 00cc83d
commit e9dcbc2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/...loneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser b/...loneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser
diff --git a/...ileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta b/...ileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta
diff --git a/Package/StandaloneFileBrowser.unitypackage b/Package/StandaloneFileBrowser.unitypackage
diff --git a/Plugins/MacOS/StandaloneFileBrowser/Plugin.mm b/Plugins/MacOS/StandaloneFileBrowser/Plugin.mm
@@ -7,9 +7,9 @@
                                 const char* filters,
                                 bool multiselect) {
     StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
-    NSString* paths = [dialog dialogOpenFilePanel:[NSString stringWithUTF8String:title]
-                                        directory:[NSString stringWithUTF8String:directory]
-                                          filters:[NSString stringWithUTF8String:filters]
+    NSString* paths = [dialog dialogOpenFilePanel:[NSString stringWithUTF8String:title ?: ""]
+                                        directory:[NSString stringWithUTF8String:directory ?: ""]
+                                          filters:[NSString stringWithUTF8String:filters ?: ""]
                                       multiselect:multiselect
                                    canChooseFiles:YES
                                  canChooseFolders:NO];
@@ -23,9 +23,9 @@ void DialogOpenFilePanelAsync(const char* title,
                               callbackFunc cb) {
     asyncCallback = cb;
     StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
-    [dialog dialogOpenFilePanelAsync:[NSString stringWithUTF8String:title]
-                           directory:[NSString stringWithUTF8String:directory]
-                             filters:[NSString stringWithUTF8String:filters]
+    [dialog dialogOpenFilePanelAsync:[NSString stringWithUTF8String:title ?: ""]
+                           directory:[NSString stringWithUTF8String:directory ?: ""]
+                             filters:[NSString stringWithUTF8String:filters ?: ""]
                          multiselect:multiselect
                       canChooseFiles:YES
                     canChooseFolders:NO];
@@ -35,8 +35,8 @@ void DialogOpenFilePanelAsync(const char* title,
                                   const char* directory,
                                   bool multiselect) {
     StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
-    NSString* paths = [dialog dialogOpenFilePanel:[NSString stringWithUTF8String:title]
-                                        directory:[NSString stringWithUTF8String:directory]
+    NSString* paths = [dialog dialogOpenFilePanel:[NSString stringWithUTF8String:title ?: ""]
+                                        directory:[NSString stringWithUTF8String:directory ?: ""]
                                           filters:[NSString stringWithUTF8String:""]
                                       multiselect:multiselect
                                    canChooseFiles:NO
@@ -50,8 +50,8 @@ void DialogOpenFolderPanelAsync(const char* title,
                                 callbackFunc cb) {
     asyncCallback = cb;
     StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
-    [dialog dialogOpenFilePanelAsync:[NSString stringWithUTF8String:title]
-                           directory:[NSString stringWithUTF8String:directory]
+    [dialog dialogOpenFilePanelAsync:[NSString stringWithUTF8String:title ?: ""]
+                           directory:[NSString stringWithUTF8String:directory ?: ""]
                              filters:[NSString stringWithUTF8String:""]
                          multiselect:multiselect
                       canChooseFiles:NO
@@ -63,10 +63,10 @@ void DialogOpenFolderPanelAsync(const char* title,
                                 const char* defaultName,
                                 const char* filters) {
     StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
-    NSString* paths = [dialog dialogSaveFilePanel:[NSString stringWithUTF8String:title]
-                                        directory:[NSString stringWithUTF8String:directory]
-                                      defaultName:[NSString stringWithUTF8String:defaultName]
-                                          filters:[NSString stringWithUTF8String:filters]];
+    NSString* paths = [dialog dialogSaveFilePanel:[NSString stringWithUTF8String:title ?: ""]
+                                        directory:[NSString stringWithUTF8String:directory ?: ""]
+                                      defaultName:[NSString stringWithUTF8String:defaultName ?: ""]
+                                          filters:[NSString stringWithUTF8String:filters ?: ""]];
     return [paths UTF8String];
 }
 
@@ -77,10 +77,10 @@ void DialogSaveFilePanelAsync(const char* title,
                               callbackFunc cb) {
     asyncCallback = cb;
     StandaloneFileBrowser* dialog = [[StandaloneFileBrowser alloc] init];
-    [dialog dialogSaveFilePanelAsync:[NSString stringWithUTF8String:title]
-                           directory:[NSString stringWithUTF8String:directory]
-                         defaultName:[NSString stringWithUTF8String:defaultName]
-                             filters:[NSString stringWithUTF8String:filters]];
+    [dialog dialogSaveFilePanelAsync:[NSString stringWithUTF8String:title ?: ""]
+                           directory:[NSString stringWithUTF8String:directory ?: ""]
+                         defaultName:[NSString stringWithUTF8String:defaultName ?: ""]
+                             filters:[NSString stringWithUTF8String:filters ?: ""]];
 }
 
 

diff --git a/...roj/project.xcworkspace/xcuserdata/gokhangokce.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/gokhangokce.xcuserdatad/UserInterfaceState.xcuserstate