fixed: Python threads should be allowed to run while waiting for dial…

…ogs to complete. Fixes xbmc#9947.

(cherry picked from commit b2b756599f6ae242a4b640ce020e01a3a892488d)

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

xbmc/lib/libPython/xbmcmodule/dialog.cpp

@@ -133,8 +133,7 @@ namespace PYXBMC
     pDialog->SetLine(2, utf8Line[3]);
 
     //send message and wait for user input
-    ThreadMessage tMsg = {TMSG_DIALOG_DOMODAL, window, ACTIVE_WINDOW};
-    g_application.getApplicationMessenger().SendMessage(tMsg, true);
+    PyXBMCWaitForThreadMessage(TMSG_DIALOG_DOMODAL, window, ACTIVE_WINDOW);
 
     return Py_BuildValue((char*)"b", pDialog->IsConfirmed());
   }
@@ -327,8 +326,7 @@ namespace PYXBMC
       pDialog->SetChoice(1,utf8Line[5]);
 
     //send message and wait for user input
-    ThreadMessage tMsg = {TMSG_DIALOG_DOMODAL, window, ACTIVE_WINDOW};
-    g_application.getApplicationMessenger().SendMessage(tMsg, true);
+    PyXBMCWaitForThreadMessage(TMSG_DIALOG_DOMODAL, window, ACTIVE_WINDOW);
 
     return Py_BuildValue((char*)"b", pDialog->IsConfirmed());
   }
@@ -376,8 +374,7 @@ namespace PYXBMC
       pDialog->SetAutoClose(autoClose);
 
     //send message and wait for user input
-    ThreadMessage tMsg = {TMSG_DIALOG_DOMODAL, window, ACTIVE_WINDOW};
-    g_application.getApplicationMessenger().SendMessage(tMsg, true);
+    PyXBMCWaitForThreadMessage(TMSG_DIALOG_DOMODAL, window, ACTIVE_WINDOW);
 
     return Py_BuildValue((char*)"i", pDialog->GetSelectedLabel());
   }

xbmc/lib/libPython/xbmcmodule/keyboard.cpp

@@ -104,8 +104,7 @@ namespace PYXBMC
       pKeyboard->SetAutoClose(autoClose);
 
     // do modal of dialog
-    ThreadMessage tMsg = {TMSG_DIALOG_DOMODAL, WINDOW_DIALOG_KEYBOARD, g_windowManager.GetActiveWindow()};
-    g_application.getApplicationMessenger().SendMessage(tMsg, true);
+    PyXBMCWaitForThreadMessage(TMSG_DIALOG_DOMODAL, WINDOW_DIALOG_KEYBOARD, g_windowManager.GetActiveWindow());
 
     Py_INCREF(Py_None);
     return Py_None;

xbmc/lib/libPython/xbmcmodule/pyutil.cpp

@@ -27,6 +27,7 @@
 #include "utils/CharsetConverter.h"
 #include "CriticalSection.h"
 #include "SingleLock.h"
+#include "Application.h"
 
 using namespace std;
 
@@ -91,6 +92,14 @@ namespace PYXBMC
     }
   }
 
+  void PyXBMCWaitForThreadMessage(int message, int param1, int param2)
+  {
+    Py_BEGIN_ALLOW_THREADS
+    ThreadMessage tMsg = {message, param1, param2};
+    g_application.getApplicationMessenger().SendMessage(tMsg, true);
+    Py_END_ALLOW_THREADS
+  }
+
   static char defaultImage[1024];
   /*
    * Looks in references.xml for image name

xbmc/lib/libPython/xbmcmodule/pyutil.h

@@ -57,6 +57,7 @@ namespace PYXBMC
   bool  PyXBMCWindowIsNull(void* pWindow);
 
   void  PyXBMCInitializeTypeObject(PyTypeObject* type_object);
+  void  PyXBMCWaitForThreadMessage(int message, int param1, int param2);
 }
 
 // Python doesn't play nice with PyXBMC_AddPendingCall