gui: if GUIDialogBoxBase first use in xbmc was from non gui thread, it would crash

This happened if you enabled PVR without having done anything else.

diff --git a/xbmc/guilib/GUIMessage.h b/xbmc/guilib/GUIMessage.h
index 28463e0..ae17b1d 100644 (file)
--- a/xbmc/guilib/GUIMessage.h
+++ b/xbmc/guilib/GUIMessage.h
@@ -132,6 +132,8 @@
 
 #define GUI_MSG_SET_TEXT        42
 
+#define GUI_MSG_WINDOW_LOAD 43
+
 #define GUI_MSG_USER         1000
 
 /*!

diff --git a/xbmc/guilib/GUIWindow.cpp b/xbmc/guilib/GUIWindow.cpp
index 458c247..d10f010 100644 (file)
--- a/xbmc/guilib/GUIWindow.cpp
+++ b/xbmc/guilib/GUIWindow.cpp
@@ -506,6 +506,13 @@ bool CGUIWindow::OnMessage(CGUIMessage& message)
 {
   switch ( message.GetMessage() )
   {
+  case GUI_MSG_WINDOW_LOAD:
+    {
+      Initialize();
+      return true;
+    }
+    break;
+      
   case GUI_MSG_WINDOW_INIT:
     {
       CLog::Log(LOGDEBUG, "------ Window Init (%s) ------", GetProperty("xmlfile").c_str());
@@ -728,7 +735,15 @@ bool CGUIWindow::Initialize()
 {
   if (!g_windowManager.Initialized())
     return false;     // can't load if we have no skin yet
-  return Load(GetProperty("xmlfile").asString());
+  if(m_windowLoaded)
+    return false;
+  if(g_application.IsCurrentThread())
+    return Load(GetProperty("xmlfile").asString());
+  else
+  {
+    CGUIMessage msg(GUI_MSG_WINDOW_LOAD, 0, 0);
+    g_windowManager.SendThreadMessage(msg, GetID());
+  }
 }
 
 void CGUIWindow::SetInitialVisibility()