fixed hang when exiting XBMC with remote

xbmc · Jan 21, 2012 · a837a10 · a837a10
1 parent bcbe164
commit a837a10
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -3010,6 +3010,11 @@ bool CApplication::ProcessEventServer(float frameTime)
   bool isAxis = false;
   float fAmount = 0.0;
 
+  // es->ExecuteNextAction() invalidates the ref to the CEventServer instance
+  // when the action exits XBMC
+  es = CEventServer::GetInstance();
+  if (!es || !es->Running() || es->GetNumberOfClients()==0)
+    return false;
   WORD wKeyID = es->GetButtonCode(joystickName, isAxis, fAmount);
 
   if (wKeyID)