[Scummvm-cvs-logs] scummvm master -> 5159996cecce2ae0d9e8f2b8567fd4ffd93ee6b4

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5159996cec KEYMAPPER: Have clicking on another remap button disable remapping


Commit: 5159996cecce2ae0d9e8f2b8567fd4ffd93ee6b4
    https://github.com/scummvm/scummvm/commit/5159996cecce2ae0d9e8f2b8567fd4ffd93ee6b4
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-02-19T22:06:50-08:00

Commit Message:
KEYMAPPER: Have clicking on another remap button disable remapping

Prevents the remapping code from being activated twice (throwing an assertion)

Changed paths:
    backends/keymapper/remap-dialog.cpp



diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 2d39bcd..3aa3647 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("...");