aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2015-08-28 09:49:21 +0200
committerMemphiz <memphis@machzwo.de>2015-08-28 09:49:21 +0200
commit896511cb1bd03a0927903f5f65f8c572129e8154 (patch)
treeaee61e13fa9e0c06275382bef3aa36cf954a2bc4
parent1d26a1ff992b2eb76ebbea071cfae5e1ed109c35 (diff)
[osx] - on 10.7.x runtime never call Cocoa_GetVolumeNameFromMountPoint as it crashes
-rw-r--r--xbmc/storage/osx/DarwinStorageProvider.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/xbmc/storage/osx/DarwinStorageProvider.cpp b/xbmc/storage/osx/DarwinStorageProvider.cpp
index 6be9ab13cd..19c99b7ef2 100644
--- a/xbmc/storage/osx/DarwinStorageProvider.cpp
+++ b/xbmc/storage/osx/DarwinStorageProvider.cpp
@@ -29,6 +29,7 @@
#include <DiskArbitration/DiskArbitration.h>
#include <IOKit/storage/IOCDMedia.h>
#include <IOKit/storage/IODVDMedia.h>
+#include "osx/DarwinUtils.h"
#endif
#include "osx/CocoaInterface.h"
@@ -62,6 +63,9 @@ void CDarwinStorageProvider::GetLocalDrives(VECSOURCES &localDrives)
share.strName = "Volumes";
share.m_ignore = true;
localDrives.push_back(share);
+
+ if (CDarwinUtils::IsLion())
+ return; //temp workaround for crash in Cocoa_GetVolumeNameFromMountPoint on 10.7.x
// This will pick up all local non-removable disks including the Root Disk.
DASessionRef session = DASessionCreate(kCFAllocatorDefault);
@@ -106,6 +110,10 @@ void CDarwinStorageProvider::GetLocalDrives(VECSOURCES &localDrives)
void CDarwinStorageProvider::GetRemovableDrives(VECSOURCES &removableDrives)
{
#if defined(TARGET_DARWIN_OSX)
+
+ if (CDarwinUtils::IsLion())
+ return; //temp workaround for crash in Cocoa_GetVolumeNameFromMountPoint on 10.7.x
+
DASessionRef session = DASessionCreate(kCFAllocatorDefault);
if (session)
{