From 3c370259a939790530712e479066261f4c62eb60 Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Thu, 21 Dec 2017 11:33:46 +0000 Subject: [PATCH] Fixed an issue with the FileChooser prepending "/localhost" to paths --- .../native/juce_mac_FileChooser.mm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/juce_gui_basics/native/juce_mac_FileChooser.mm b/modules/juce_gui_basics/native/juce_mac_FileChooser.mm index a628432e3a..bd983fb5b8 100644 --- a/modules/juce_gui_basics/native/juce_mac_FileChooser.mm +++ b/modules/juce_gui_basics/native/juce_mac_FileChooser.mm @@ -207,17 +207,24 @@ private: if (panel != nil && result == NSFileHandlingPanelOKButton) { + auto addURLResult = [&chooserResults] (NSURL* urlToAdd) + { + auto scheme = nsStringToJuce ([urlToAdd scheme]); + auto path = nsStringToJuce ([urlToAdd path]); + chooserResults.add (URL (scheme + "://" + path)); + }; + if (isSave) { - chooserResults.add (URL (nsStringToJuce ([[panel URL] absoluteString]))); + addURLResult ([panel URL]); } else { - NSOpenPanel* openPanel = (NSOpenPanel*) panel; - NSArray* urls = [openPanel URLs]; + auto* openPanel = (NSOpenPanel*) panel; + auto* urls = [openPanel URLs]; for (unsigned int i = 0; i < [urls count]; ++i) - chooserResults.add (URL (nsStringToJuce ([[urls objectAtIndex: i] absoluteString]))); + addURLResult ([urls objectAtIndex: i]); } }