From 0e26f0ea2d42bb695f976f2a76e0de670b6bebeb Mon Sep 17 00:00:00 2001
From: Alcaro <floating@muncher.se>
Date: Sat, 29 Nov 2014 22:11:35 +0100
Subject: [PATCH] (SDL) Fix some creepy misuse of temporaries.

---
 input/sdl_joypad.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/input/sdl_joypad.c b/input/sdl_joypad.c
index cf59741638..195ca3c64e 100644
--- a/input/sdl_joypad.c
+++ b/input/sdl_joypad.c
@@ -93,7 +93,8 @@ static void pad_connect(unsigned id)
    int32_t vendor = 0;
 
 #ifdef HAVE_SDL2
-   uint16_t *guid = NULL;
+   SDL_JoystickGUID guid;
+   uint16_t *guid_ptr;
 
    if (SDL_IsGameController(id))
    {
@@ -124,13 +125,14 @@ static void pad_connect(unsigned id)
    strlcpy(g_settings.input.device_names[id], pad_name(id), sizeof(g_settings.input.device_names[id]));
 
 #ifdef HAVE_SDL2
-   guid = (uint16_t*)SDL_JoystickGetGUID(pad->joypad).data;
+   guid = SDL_JoystickGetGUID(pad->joypad);
+   guid_ptr = (uint16_t*)guid.data;
 #ifdef __linux
-   vendor = guid[2];
-   product = guid[4];
+   vendor = guid_ptr[2];
+   product = guid_ptr[4];
 #elif _WIN32
-   vendor = guid[0];
-   product = guid[1];
+   vendor = guid_ptr[0];
+   product = guid_ptr[1];
 #endif
 #endif
    input_config_autoconfigure_joypad(id, pad_name(id),