Fix major overstep with last commit

[vg.git] / src / vg / vg_input.h

diff --git a/src/vg/vg_input.h b/src/vg/vg_input.h
index 3985f3c26975dcc89acb5dcfeb1776e078a58898..c33853136ceb01e15dd8ff94dbd7c383ddd8eff6 100644 (file)
--- a/src/vg/vg_input.h
+++ b/src/vg/vg_input.h
@@ -178,33 +178,29 @@ void vg_update_inputs(void)
        }
 }
 
-static int vg_gamepad_init(void)
+static void vg_gamepad_init(void)
 {
-   if( vg_acquire_thread_sync(1) )
+   vg_acquire_thread_sync();
+
+   for( int id=0; id<=GLFW_JOYSTICK_LAST; id ++ )
    {
-      for( int id=0; id<=GLFW_JOYSTICK_LAST; id ++ )
+      if( glfwJoystickPresent( id ) )
       {
-         if( glfwJoystickPresent( id ) )
-         {
-            vg_info( "Joystick found: '%s'\n", glfwGetJoystickName(id) );
-         }
-
-         if( glfwJoystickIsGamepad( id ) )
-         {
-            vg.gamepad_name = glfwGetGamepadName( id );
-            vg_success( "Gamepad mapping registered: %s\n", vg.gamepad_name );
-            
-            vg.gamepad_ready = 1;
-            vg.gamepad_id = id;
-            break;
-         }
+         vg_info( "Joystick found: '%s'\n", glfwGetJoystickName(id) );
       }
 
-      vg_release_thread_sync(1);
-      return 1;
+      if( glfwJoystickIsGamepad( id ) )
+      {
+         vg.gamepad_name = glfwGetGamepadName( id );
+         vg_success( "Gamepad mapping registered: %s\n", vg.gamepad_name );
+         
+         vg.gamepad_ready = 1;
+         vg.gamepad_id = id;
+         break;
+      }
    }
 
-   return 0;
+   vg_release_thread_sync();
 }
 
 #endif