Skip to content
Browse files

python: fix search in plugins (thx cptspiff). Done after discussions …

…in IRC.

This stops progress bars from opening when a Modal Dialog is open.
  • Loading branch information...
1 parent c28fc84 commit 73867cfb2e503f3ea8bdca98ef9f7e60cb4c037d @fritsch fritsch committed Aug 4, 2012
Showing with 4 additions and 1 deletion.
  1. +1 −1 xbmc/filesystem/PluginDirectory.cpp
  2. +3 −0 xbmc/interfaces/python/xbmcmodule/keyboard.cpp
View
2 xbmc/filesystem/PluginDirectory.cpp
@@ -478,7 +478,7 @@ bool CPluginDirectory::WaitOnScriptResult(const CStdString &scriptPath, const CS
}
// check whether we should pop up the progress dialog
- if (!progressBar && XbmcThreads::SystemClockMillis() - startTime > timeBeforeProgressBar)
+ if (!progressBar && XbmcThreads::SystemClockMillis() - startTime > timeBeforeProgressBar && !g_windowManager.HasModalDialog())
{ // loading takes more then 1.5 secs, show a progress dialog
progressBar = (CGUIDialogProgress *)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
View
3 xbmc/interfaces/python/xbmcmodule/keyboard.cpp
@@ -92,6 +92,9 @@ namespace PYXBMC
if (!PyArg_ParseTuple(args, (char*)"|i", &autoClose)) return NULL;
+ if (g_windowManager.IsWindowActive(WINDOW_DIALOG_PROGRESS))
+ g_windowManager.CloseDialogs();
+
PyXBMCGUILock();
pKeyboard->Initialize();
pKeyboard->SetHeading(self->strHeading);

0 comments on commit 73867cf

Please sign in to comment.
Something went wrong with that request. Please try again.