Merge pull request #4857 from t-nelson/Gotham_13.2_backports

[vuplus_xbmc] / xbmc / XBApplicationEx.cpp

diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp
index 25aa48b..ad6a145 100644 (file)
--- a/xbmc/XBApplicationEx.cpp
+++ b/xbmc/XBApplicationEx.cpp
@@ -1,20 +1,20 @@
 /*
- *      Copyright (C) 2005-2012 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
+ *  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
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  This Program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -38,9 +38,9 @@ CXBApplicationEx::CXBApplicationEx()
 {
   // Variables to perform app timing
   m_bStop = false;
-  m_AppActive = true;
   m_AppFocused = true;
   m_ExitCode = EXITCODE_QUIT;
+  m_renderGUI = false;
 }
 
 CXBApplicationEx::~CXBApplicationEx()
@@ -52,7 +52,6 @@ bool CXBApplicationEx::Create()
 {
   // Variables to perform app timing
   m_bStop = false;
-  m_AppActive = true;
   m_AppFocused = true;
   m_ExitCode = EXITCODE_QUIT;
 
@@ -75,7 +74,7 @@ VOID CXBApplicationEx::Destroy()
 }
 
 /* Function that runs the application */
-INT CXBApplicationEx::Run(bool renderGUI)
+INT CXBApplicationEx::Run()
 {
   CLog::Log(LOGNOTICE, "Running the application..." );
 
@@ -138,7 +137,7 @@ INT CXBApplicationEx::Run(bool renderGUI)
     try
     {
 #endif
-      if (!m_bStop) FrameMove(true, renderGUI);
+      if (!m_bStop) FrameMove(true, m_renderGUI);
       //reset exception count
 #ifdef XBMC_TRACK_EXCEPTIONS
       frameMoveExceptionCount = 0;
@@ -173,8 +172,8 @@ INT CXBApplicationEx::Run(bool renderGUI)
     try
     {
 #endif
-      if (renderGUI && !m_bStop) Render();
-      else if (!renderGUI)
+      if (m_renderGUI && !m_bStop) Render();
+      else if (!m_renderGUI)
       {
         frameTime = XbmcThreads::SystemClockMillis() - lastFrameTime;
         if(frameTime < noRenderFrameTime)