X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=a5bc5ac1b7009f31f46d5831681f9705d7eb8d2e;hp=ba5a211911500f064607ea445b1b0a2f236e0dc8;hb=f6d6f94c5738467ae3f3ba639f01244581d8ea1f;hpb=26e7b7362a984abbe5852a792a52b8e58e11420e

diff --git a/src/screens.c b/src/screens.c
index ba5a2119..a5bc5ac1 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -6522,7 +6522,6 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
   static boolean bitmaps_initialized = FALSE;
   boolean screen_initialized = FALSE;
   static Bitmap *controller, *button, *axis_x, *axis_y;
-  Bitmap *marker;
   char *name;
   boolean success = TRUE;
   boolean done = FALSE, next = FALSE;
@@ -6602,6 +6601,8 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
   /* loop through all steps (buttons and axes), getting joystick events */
   for (i = 0; i < SDL_arraysize(steps) && !done;)
   {
+    Bitmap *marker = button;	/* initialize with reliable default value */
+
     step = &steps[i];
     strcpy(step->mapping, mapping);
     step->axis = -1;