From d8c2e6a31a088507d7828948711a6d58e7c23292 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Fri, 18 Oct 2019 15:36:29 +0300
Subject: [PATCH] [macOS] Fix non-ASCII volume name listing, replace deprecated
 volume listing API. Remove hidden mount points from the volume list.

---
 platform/osx/dir_access_osx.mm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/platform/osx/dir_access_osx.mm b/platform/osx/dir_access_osx.mm
index ada142005b0..75f50aaa285 100644
--- a/platform/osx/dir_access_osx.mm
+++ b/platform/osx/dir_access_osx.mm
@@ -48,18 +48,25 @@ String DirAccessOSX::fix_unicode_name(const char *p_name) const {
 }
 
 int DirAccessOSX::get_drive_count() {
-	NSArray *vols = [[NSWorkspace sharedWorkspace] mountedLocalVolumePaths];
+	NSArray *res_keys = [NSArray arrayWithObjects:NSURLVolumeURLKey, NSURLIsSystemImmutableKey, nil];
+	NSArray *vols = [[NSFileManager defaultManager] mountedVolumeURLsIncludingResourceValuesForKeys:res_keys options:NSVolumeEnumerationSkipHiddenVolumes];
+
 	return [vols count];
 }
 
 String DirAccessOSX::get_drive(int p_drive) {
-	NSArray *vols = [[NSWorkspace sharedWorkspace] mountedLocalVolumePaths];
+	NSArray *res_keys = [NSArray arrayWithObjects:NSURLVolumeURLKey, NSURLIsSystemImmutableKey, nil];
+	NSArray *vols = [[NSFileManager defaultManager] mountedVolumeURLsIncludingResourceValuesForKeys:res_keys options:NSVolumeEnumerationSkipHiddenVolumes];
 	int count = [vols count];
 
 	ERR_FAIL_INDEX_V(p_drive, count, "");
 
-	NSString *path = vols[p_drive];
-	return String([path UTF8String]);
+	String volname;
+	NSString *path = [vols[p_drive] path];
+
+	volname.parse_utf8([path UTF8String]);
+
+	return volname;
 }
 
 #endif //posix_enabled