Permalink
Browse files

fixed hang when exiting XBMC with remote

  • Loading branch information...
1 parent e866112 commit fb1c5eaa57f6fc2519ce9e542815553933e89e8b @CrystalP committed Sep 23, 2011
Showing with 5 additions and 0 deletions.
  1. +5 −0 xbmc/Application.cpp
View
@@ -2924,6 +2924,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 fb1c5ea

Please sign in to comment.