Camilla Löwy hai 1 ano
pai
achega
2a4dd9c28f
Modificáronse 2 ficheiros con 4 adicións e 5 borrados
  1. 3 4
      src/linux_joystick.c
  2. 1 1
      src/linux_joystick.h

+ 3 - 4
src/linux_joystick.c

@@ -326,9 +326,8 @@ GLFWbool _glfwInitJoysticksLinux(void)
 
     // Continue without device connection notifications if inotify fails
 
-    _glfw.linjs.regex_compiled = regcomp(&_glfw.linjs.regex,
-                                         "^event[0-9]\\+$", 0) == 0;
-    if (!_glfw.linjs.regex_compiled)
+    _glfw.linjs.regexCompiled = (regcomp(&_glfw.linjs.regex, "^event[0-9]\\+$", 0) == 0);
+    if (!_glfw.linjs.regexCompiled)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to compile regex");
         return GLFW_FALSE;
@@ -382,7 +381,7 @@ void _glfwTerminateJoysticksLinux(void)
         close(_glfw.linjs.inotify);
     }
 
-    if (_glfw.linjs.regex_compiled)
+    if (_glfw.linjs.regexCompiled)
         regfree(&_glfw.linjs.regex);
 }
 

+ 1 - 1
src/linux_joystick.h

@@ -50,7 +50,7 @@ typedef struct _GLFWlibraryLinux
     int                     inotify;
     int                     watch;
     regex_t                 regex;
-    GLFWbool                regex_compiled;
+    GLFWbool                regexCompiled;
     GLFWbool                dropped;
 } _GLFWlibraryLinux;