fixed iCurrentControlId was not set if python window id wasn't specified

fixes #11859
xbmc · Aug 23, 2011 · 061e1f6 · 061e1f6
1 parent e391fde
commit 061e1f6
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/xbmc/interfaces/python/xbmcmodule/window.cpp b/xbmc/interfaces/python/xbmcmodule/window.cpp
@@ -73,9 +73,6 @@ namespace PYXBMC
         PyErr_SetString(PyExc_ValueError, "Window id does not exist");
         return false;
       }
-      pWindow->iOldWindowId = 0;
-      pWindow->bModal = false;
-      pWindow->iCurrentControlId = 3000;
       pWindow->bIsPythonWindow = false;
     }
     else
@@ -92,8 +89,6 @@ namespace PYXBMC
       while(id < WINDOW_PYTHON_END && g_windowManager.GetWindow(id) != NULL) id++;
 
       pWindow->iWindowId = id;
-      pWindow->iOldWindowId = 0;
-      pWindow->bModal = false;
       pWindow->bIsPythonWindow = true;
 
       if (pWindow->bUsingXML)
@@ -115,6 +110,9 @@ namespace PYXBMC
 
       g_windowManager.Add(pWindow->pWindow);
     }
+    pWindow->iOldWindowId = 0;
+    pWindow->bModal = false;
+    pWindow->iCurrentControlId = 3000;
     return true;
   }