Merge pull request #1283 from pieh/window_load_on_demand

Keep GUIControls alive after window deinit

diff --cc xbmc/GUIInfoManager.cpp
index 28fd369,8163adb..80e4ed2
--- 1/xbmc/GUIInfoManager.cpp
--- 2/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@@ -5277,3 -5271,13 +5277,13 @@@ CStdString CGUIInfoManager::GetSkinVari
  
    return "";
  }
 -}
+ 
+ bool CGUIInfoManager::ConditionsChangedValues(const std::map<int, bool>& map)
+ {
+   for (std::map<int, bool>::const_iterator it = map.begin() ; it != map.end() ; it++)
+   {
+     if (GetBoolValue(it->first) != it->second)
+       return true;
+   }
+   return false;
++}

diff --cc xbmc/GUIInfoManager.h
Simple merge

diff --cc xbmc/addons/Skin.cpp
Simple merge

diff --cc xbmc/addons/Skin.h
Simple merge

diff --cc xbmc/dialogs/GUIDialogContextMenu.cpp
Simple merge

diff --cc xbmc/guilib/GUIWindow.cpp
Simple merge