Merge pull request #567 from Montellese/jsonrpc_12279

[vuplus_xbmc] / xbmc / Application.cpp

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 41c3b5c..f8f119e 100644 (file)
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -1167,7 +1167,12 @@ bool CApplication::Initialize()
   if (g_settings.UsingLoginScreen())
     g_windowManager.ActivateWindow(WINDOW_LOGIN_SCREEN);
   else
+  {
+#ifdef HAS_JSONRPC
+    CJSONRPC::Initialize();
+#endif
     g_windowManager.ActivateWindow(g_SkinInfo->GetFirstWindow());
+  }
 
   g_sysinfo.Refresh();
 
@@ -1190,7 +1195,7 @@ bool CApplication::Initialize()
   {
     UpdateLibraries();
 #ifdef HAS_PYTHON
-  g_pythonParser.m_bLogin = true;
+    g_pythonParser.m_bLogin = true;
 #endif
   }
 
@@ -1203,10 +1208,6 @@ bool CApplication::Initialize()
   CCrystalHD::GetInstance();
 #endif
 
-#ifdef HAS_JSONRPC
-  CJSONRPC::Initialize();
-#endif
-
   CAddonMgr::Get().StartServices(false);
 
   CLog::Log(LOGNOTICE, "initialize done");