From 8be7939803edf7708d7782ed6252c001345ebe4a Mon Sep 17 00:00:00 2001
From: Don Honerbrink <dhonerbrink@gmail.com>
Date: Mon, 3 Aug 2015 10:14:04 -0500
Subject: [PATCH] Fixing bad merge for user input joystick handling.

---
 RetroFE/Source/Control/UserInput.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/RetroFE/Source/Control/UserInput.cpp b/RetroFE/Source/Control/UserInput.cpp
index b8f3d75..8e5559c 100644
--- a/RetroFE/Source/Control/UserInput.cpp
+++ b/RetroFE/Source/Control/UserInput.cpp
@@ -79,8 +79,7 @@ bool UserInput::initialize()
 
     for(int i = 0; i < SDL_NumJoysticks(); ++i)
     {
-        joystick_ = SDL_JoystickOpen(i);
-        break;
+        joysticks_.push_back(SDL_JoystickOpen(i));
     }