Skip to content
This repository
Browse code

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
authored October 05, 2012 t-nelson committed October 03, 2013

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  xbmc/Application.cpp
6  xbmc/Application.cpp
@@ -809,6 +809,9 @@ bool CApplication::Create()
809 809
     CLog::Log(LOGFATAL, "CApplication::Create: Unable to start CAddonMgr");
810 810
     return false;
811 811
   }
  812
+#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
  813
+  g_RemoteControl.Initialize();
  814
+#endif
812 815
 
813 816
   // set logging from debug add-on
814 817
   AddonPtr addon;
@@ -824,9 +827,6 @@ bool CApplication::Create()
824 827
   g_Mouse.SetEnabled(CSettings::Get().GetBool("input.enablemouse"));
825 828
 
826 829
   g_Keyboard.Initialize();
827  
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
828  
-  g_RemoteControl.Initialize();
829  
-#endif
830 830
 
831 831
 #if defined(TARGET_DARWIN_OSX)
832 832
   // Configure and possible manually start the helper.

0 notes on commit d0b6de6

Please sign in to comment.
Something went wrong with that request. Please try again.