Permalink
Browse files

Merge branch 'fix-remote-exit'

* fix-remote-exit:
  fixed hang when exiting XBMC with remote
  • Loading branch information...
2 parents bcbe164 + a837a10 commit 93b146aec5873e55f35598750f3387cdcd1d8e38 Jonathan Marshall committed Jan 21, 2012
Showing with 5 additions and 0 deletions.
  1. +5 −0 xbmc/Application.cpp
View
@@ -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)

0 comments on commit 93b146a

Please sign in to comment.