Ticket #8863: mythsystem_liirc_locking.diff

trunk/mythtv/libs/libmythdb/mythsystem.cpp

@@ -42 +42 @@
 #include "mythverbose.h"
 #include "exitcodes.h"
 
-#ifdef USE_LIRC
-#include "lircevent.h"
+#if CONFIG_LIRC
+#include "../libmythui/lircevent.h"
 #endif
 
 #ifdef USE_JOYSTICK_MENU
@@ -251 +251 @@
     }
 
     myth_system_pre_flags( flags, ready_to_lock );
+
+#if CONFIG_LIRC
+    bool lirc_lock_flag = !(flags & MYTH_SYSTEM_DONT_BLOCK_LIRC);
+    LircEventLock lirc_lock(lirc_lock_flag && ready_to_lock);
+#endif
+
 #ifndef USING_MINGW
     pid_t   pid;
 
@@ -302 +308 @@
 {
     ready_to_lock = gCoreContext->HasGUI() && gCoreContext->IsUIThread();
 
-#ifdef USE_LIRC
-    bool lirc_lock_flag = !(flags & MYTH_SYSTEM_DONT_BLOCK_LIRC);
-    LircEventLock lirc_lock(lirc_lock_flag && ready_to_lock);
-#endif
-
 #ifdef USE_JOYSTICK_MENU
     bool joy_lock_flag = !(flags & MYTH_SYSTEM_DONT_BLOCK_JOYSTICK_MENU);
     JoystickMenuEventLock joystick_lock(joy_lock_flag && ready_to_lock);