From 5159996cecce2ae0d9e8f2b8567fd4ffd93ee6b4 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 20 Feb 2014 01:06:50 -0500
Subject: KEYMAPPER: Have clicking on another remap button disable remapping

Prevents the remapping code from being activated twice (throwing an assertion)
---
 backends/keymapper/remap-dialog.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'backends')

diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 2d39bcd3b2..3aa3647048 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -258,6 +258,12 @@ void RemapDialog::startRemapping(uint i) {
 	if (_topAction + i >= _currentActions.size())
 		return;
 
+	if (_keymapper->isRemapping()) {
+		// Handle a second click on the button as a stop to remapping
+		stopRemapping(true);
+		return;
+	}
+
 	_remapTimeout = g_system->getMillis() + kRemapTimeoutDelay;
 	Action *activeRemapAction = _currentActions[_topAction + i].action;
 	_keymapWidgets[i].keyButton->setLabel("...");
-- 
cgit v1.2.3