From 6e013653cb19faac897bad7e95e6aabefdc8c723 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Sat, 19 Jan 2013 21:20:30 +0200 Subject: [PATCH] Fix bug when changing controller key to another subkey of the same key --- src/library/keymapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/library/keymapper.cpp b/src/library/keymapper.cpp index 61da986d..8f11826b 100644 --- a/src/library/keymapper.cpp +++ b/src/library/keymapper.cpp @@ -451,10 +451,10 @@ std::string controller_key::get_string() throw(std::bad_alloc) void controller_key::set(keyboard_key* _key, unsigned _subkey) throw() { umutex_class u(mutex); - if(_key) - _key->add_listener(*this, false); - if(key) - key->remove_listener(*this); + if(key != _key) { + if(_key) _key->add_listener(*this, false); + if(key) key->remove_listener(*this); + } key = _key; subkey = _subkey; }