Merge pull request #5039 from CEikermann/patch-1

[vuplus_xbmc] / xbmc / xbmc.cpp

diff --git a/xbmc/xbmc.cpp b/xbmc/xbmc.cpp
index 6ea77ca..4d1047e 100644 (file)
--- a/xbmc/xbmc.cpp
+++ b/xbmc/xbmc.cpp
@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
+ *      Copyright (C) 2005-2013 Team XBMC
+ *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -13,9 +13,8 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -30,12 +29,6 @@ extern "C" int XBMC_Run(bool renderGUI)
 {
   int status = -1;
 
-#ifdef TARGET_RASPBERRY_PI
-  if(!g_RBP.Initialize())
-    return false;
-  g_RBP.LogFirmwareVerison();
-#endif
-
   if (!g_advancedSettings.Initialized())
   {
 #ifdef _DEBUG
@@ -53,6 +46,13 @@ extern "C" int XBMC_Run(bool renderGUI)
     fprintf(stderr, "ERROR: Unable to create application. Exiting\n");
     return status;
   }
+
+#ifdef TARGET_RASPBERRY_PI
+  if(!g_RBP.Initialize())
+    return false;
+  g_RBP.LogFirmwareVerison();
+#endif
+
   if (renderGUI && !g_application.CreateGUI())
   {
     fprintf(stderr, "ERROR: Unable to create GUI. Exiting\n");
@@ -66,7 +66,7 @@ extern "C" int XBMC_Run(bool renderGUI)
 
   try
   {
-    status = g_application.Run(renderGUI);
+    status = g_application.Run();
   }
   catch(...)
   {