changed: always include local drives in add-on settings folder browse dialogs

(cherry picked from commit f1f2f3df786c322ced8abd87dc9a4a8b2bd39cf4)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35060 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 8 insertions, 4 deletions

diff --git a/xbmc/GUIDialogAddonSettings.cpp b/xbmc/GUIDialogAddonSettings.cpp
index 41eb03852b..00fe8e8e42 100644
--- a/xbmc/GUIDialogAddonSettings.cpp
+++ b/xbmc/GUIDialogAddonSettings.cpp
@@ -288,7 +288,11 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
             if (!source || strcmpi(source, "local") != 0)
               g_mediaManager.GetNetworkLocations(networkShares);
             localShares.insert(localShares.end(), networkShares.begin(), networkShares.end());
-            shares = &localShares;
+          }
+          else // always append local drives
+          {
+            localShares = *shares;
+            g_mediaManager.GetLocalDrives(localShares);
           }
 
           if (strcmpi(type, "folder") == 0)
@@ -298,12 +302,12 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
             if (option)
               bWriteOnly = (strcmpi(option, "writeable") == 0);
 
-            if (CGUIDialogFileBrowser::ShowAndGetDirectory(*shares, label, value, bWriteOnly))
+            if (CGUIDialogFileBrowser::ShowAndGetDirectory(localShares, label, value, bWriteOnly))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
           else if (strcmpi(type, "image") == 0)
           {
-            if (CGUIDialogFileBrowser::ShowAndGetImage(*shares, label, value))
+            if (CGUIDialogFileBrowser::ShowAndGetImage(localShares, label, value))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
           else
@@ -348,7 +352,7 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
               bUseFileDirectories = find(options.begin(), options.end(), "treatasfolder") != options.end();
             }
 
-            if (CGUIDialogFileBrowser::ShowAndGetFile(*shares, strMask, label, value))
+            if (CGUIDialogFileBrowser::ShowAndGetFile(localShares, strMask, label, value))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
         }