dinput: Make find_joydevs re-entrant.

ae26ca6c · Vitaliy Margolen · Alexandre Julliard · 2e0aefc1 · ae26ca6c
Commit ae26ca6c authored Dec 27, 2008 by Vitaliy Margolen Committed by Alexandre Julliard Dec 27, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

joystick_linuxinput.c dlls/dinput/joystick_linuxinput.c +4 -6

No files found.
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -215,13 +215,11 @@ static struct JoyDev *joydevs = NULL;

 static void find_joydevs(void)
 {
-  int i;
-
-  if (have_joydevs!=-1) {
-    return;
-  }
+    int i;

-  have_joydevs = 0;
+    if (InterlockedCompareExchange(&have_joydevs, 0, -1) != -1)
+        /* Someone beat us to it */
+        return;

  for (i=0;i<MAX_JOYDEV;i++) {
    char	buf[MAX_PATH];