fixed: Some default sources may not have been set correctly when opening windows

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

7 files changed, 9 insertions, 7 deletions

diff --git a/xbmc/GUIMediaWindow.cpp b/xbmc/GUIMediaWindow.cpp
index 0de84f5547..a7661aa50b 100644
--- a/xbmc/GUIMediaWindow.cpp
+++ b/xbmc/GUIMediaWindow.cpp
@@ -453,8 +453,10 @@ bool CGUIMediaWindow::OnMessage(CGUIMessage& message)
       return true;
     }
     break;
-    case GUI_MSG_WINDOW_INIT:
+  case GUI_MSG_WINDOW_INIT:
     {
+      if (m_vecItems->m_strPath == "?")
+        m_vecItems->m_strPath.Empty();
       CStdString dir = message.GetStringParam(0);
       const CStdString &ret = message.GetStringParam(1);
       bool returning = ret.CompareNoCase("return") == 0;
diff --git a/xbmc/GUIWindowMusicNav.cpp b/xbmc/GUIWindowMusicNav.cpp
index 362bc6394e..46cc999433 100644
--- a/xbmc/GUIWindowMusicNav.cpp
+++ b/xbmc/GUIWindowMusicNav.cpp
@@ -101,7 +101,7 @@ bool CGUIWindowMusicNav::OnMessage(CGUIMessage& message)
 
       // is this the first time the window is opened?
       if (m_vecItems->m_strPath == "?" && message.GetStringParam().IsEmpty())
-        m_vecItems->m_strPath = g_settings.m_defaultMusicLibSource;
+        message.SetStringParam(g_settings.m_defaultMusicLibSource);
       
       DisplayEmptyDatabaseMessage(false); // reset message state
 
diff --git a/xbmc/GUIWindowMusicSongs.cpp b/xbmc/GUIWindowMusicSongs.cpp
index 67d2140e35..9e8c5e9068 100644
--- a/xbmc/GUIWindowMusicSongs.cpp
+++ b/xbmc/GUIWindowMusicSongs.cpp
@@ -82,7 +82,7 @@ bool CGUIWindowMusicSongs::OnMessage(CGUIMessage& message)
 
       // is this the first time the window is opened?
       if (m_vecItems->m_strPath == "?" && message.GetStringParam().IsEmpty())
-        m_vecItems->m_strPath = g_settings.m_defaultMusicSource;
+        message.SetStringParam(g_settings.m_defaultMusicSource);
 
       return CGUIWindowMusicBase::OnMessage(message);
     }
diff --git a/xbmc/GUIWindowPictures.cpp b/xbmc/GUIWindowPictures.cpp
index 025ed0e699..ef79d7683a 100644
--- a/xbmc/GUIWindowPictures.cpp
+++ b/xbmc/GUIWindowPictures.cpp
@@ -82,7 +82,7 @@ bool CGUIWindowPictures::OnMessage(CGUIMessage& message)
     {
       // is this the first time accessing this window?
       if (m_vecItems->m_strPath == "?" || message.GetStringParam())
-        m_vecItems->m_strPath = g_settings.m_defaultPictureSource;
+        message.SetStringParam(g_settings.m_defaultPictureSource);
 
       m_dlgProgress = (CGUIDialogProgress*)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
 
diff --git a/xbmc/GUIWindowPrograms.cpp b/xbmc/GUIWindowPrograms.cpp
index a1737bd2e9..d328141f6a 100644
--- a/xbmc/GUIWindowPrograms.cpp
+++ b/xbmc/GUIWindowPrograms.cpp
@@ -81,7 +81,7 @@ bool CGUIWindowPrograms::OnMessage(CGUIMessage& message)
 
       // is this the first time accessing this window?
       if (m_vecItems->m_strPath == "?" && message.GetStringParam().IsEmpty())
-        m_vecItems->m_strPath = g_settings.m_defaultProgramSource;
+        message.SetStringParam(g_settings.m_defaultProgramSource);
 
       m_database.Open();
 
diff --git a/xbmc/GUIWindowVideoFiles.cpp b/xbmc/GUIWindowVideoFiles.cpp
index 7d535626f0..4d2eb827d5 100644
--- a/xbmc/GUIWindowVideoFiles.cpp
+++ b/xbmc/GUIWindowVideoFiles.cpp
@@ -74,7 +74,7 @@ bool CGUIWindowVideoFiles::OnMessage(CGUIMessage& message)
     {
       // is this the first time accessing this window?
       if (m_vecItems->m_strPath == "?" && message.GetStringParam().IsEmpty())
-        m_vecItems->m_strPath = g_settings.m_defaultVideoSource;
+        message.SetStringParam(g_settings.m_defaultVideoSource);
 
       return CGUIWindowVideoBase::OnMessage(message);
     }
diff --git a/xbmc/GUIWindowVideoNav.cpp b/xbmc/GUIWindowVideoNav.cpp
index 2d1e03ecb9..ad71dce93f 100644
--- a/xbmc/GUIWindowVideoNav.cpp
+++ b/xbmc/GUIWindowVideoNav.cpp
@@ -119,7 +119,7 @@ bool CGUIWindowVideoNav::OnMessage(CGUIMessage& message)
 
       // is this the first time the window is opened?
       if (m_vecItems->m_strPath == "?" && message.GetStringParam().IsEmpty())
-        m_vecItems->m_strPath = g_settings.m_defaultVideoLibSource;
+        message.SetStringParam(g_settings.m_defaultVideoLibSource);
 
       DisplayEmptyDatabaseMessage(false); // reset message state