[Performous-commit] Vincent Le Ligeour : Fixed controllers overriding (yes I'll copy 50 times " I'll read the STL documentation when I use it"

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

Module: performous
Branch: portaudio
Commit: 9bb3628203fba4ed746b9c40bc158391fed70477

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Aug 11 21:18:54 2010 +0200

Fixed controllers overriding (yes I'll copy 50 times "I'll read the STL documentation when I use it"

---

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

diff --git a/game/joystick.cc b/game/joystick.cc
index d52b85c..c16ae45 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -334,6 +334,7 @@ void readControllers(input::Instruments &instruments, fs::path const& file) {
 				std::cout << "   Adding " << type << ": " << name << std::endl;
 			} else {
 				std::cout << "   Overriding " << type << ": " << name << std::endl;
+				instruments.erase(name);
 			}
 			input::Instrument instrument(name, devType, mapping);
 			instrument.match = regexp;