Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move lirc init before keyboard

LIRC's devinput driver requires exclusive access, which conflicts with our
evdev input manager. If LIRC is able to grab a device and use it, assume that
we want it to, then evdev can't grab it.
  • Loading branch information...
commit d0b6de6204bc703ea1abed96fb87d4b7f34f1faf 1 parent 3207f68
Cory Fields authored Trent Nelson committed
Showing with 3 additions and 3 deletions.
  1. +3 −3 xbmc/Application.cpp
View
6 xbmc/Application.cpp
@@ -809,6 +809,9 @@ bool CApplication::Create()
CLog::Log(LOGFATAL, "CApplication::Create: Unable to start CAddonMgr");
return false;
}
+#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
+ g_RemoteControl.Initialize();
+#endif
// set logging from debug add-on
AddonPtr addon;
@@ -824,9 +827,6 @@ bool CApplication::Create()
g_Mouse.SetEnabled(CSettings::Get().GetBool("input.enablemouse"));
g_Keyboard.Initialize();
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- g_RemoteControl.Initialize();
-#endif
#if defined(TARGET_DARWIN_OSX)
// Configure and possible manually start the helper.
Please sign in to comment.
Something went wrong with that request. Please try again.