Merge pull request #614 from stefansaraev/xbmc-udisks

xbmc: do not remount non optical devices on DeviceChanged event
This commit is contained in:
Stefan Saraev 2012-06-25 09:06:07 -07:00
commit a49072ce14
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff --git a/xbmc/storage/linux/UDisksProvider.cpp b/xbmc/storage/linux/UDisksProvider.cpp
index 6afc1a8..c940e69 100644
--- a/xbmc/storage/linux/UDisksProvider.cpp
+++ b/xbmc/storage/linux/UDisksProvider.cpp
@@ -356,7 +356,7 @@ void CUDisksProvider::DeviceChanged(const char *object, IStorageEventsCallback *
{
bool mounted = device->m_isMounted;
device->Update();
- if (g_advancedSettings.m_handleMounting)
+ if (g_advancedSettings.m_handleMounting && device->m_isOptical)
device->Mount();
if (!mounted && device->m_isMounted && callback)
callback->OnStorageAdded(device->m_Label, device->m_MountPath);

View File

@ -0,0 +1,13 @@
diff --git a/xbmc/storage/linux/UDisksProvider.cpp b/xbmc/storage/linux/UDisksProvider.cpp
index 6afc1a8..c940e69 100644
--- a/xbmc/storage/linux/UDisksProvider.cpp
+++ b/xbmc/storage/linux/UDisksProvider.cpp
@@ -356,7 +356,7 @@ void CUDisksProvider::DeviceChanged(const char *object, IStorageEventsCallback *
{
bool mounted = device->m_isMounted;
device->Update();
- if (g_advancedSettings.m_handleMounting)
+ if (g_advancedSettings.m_handleMounting && device->m_isOptical)
device->Mount();
if (!mounted && device->m_isMounted && callback)
callback->OnStorageAdded(device->m_Label, device->m_MountPath);