[Performous-commit] Tapio Vierros : Don't detect unknown joysticks as drumkit.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 72cdf29c9dbd40ac0bd7b9f8babcab6cebf8a88f

Author: Tapio Vierros <tap...@gm...>
Date:   Thu Jan  7 22:35:40 2010 +0200

Don't detect unknown joysticks as drumkit.

---

 game/joystick.cc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index 95adf32..64b1e2f 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -262,8 +262,9 @@ void input::SDL::init() {
 			std::cout << "  Detected as: Generic Dance Pad (guessed)" << std::endl;
 			input::Private::devices[i] = input::Private::InputDevPrivate(input::Private::DANCEPAD_GENERIC);
 		} else {
-			std::cout << "  Detected as: Unknwown (please report the name, assuming Guitar Hero Drums)" << std::endl;
-			input::Private::devices[i] = input::Private::InputDevPrivate(input::Private::DRUMS_GH);
+			std::cout << "  Detected as: Unknown (please report the name; use config to force detection)" << std::endl;
+			SDL_JoystickClose(joy);
+			continue;
 		}
 	}
 	// Here we should send an event to have correct state buttons