Make ActionKey constructor explicit, fix bad cast\n\nFixes: bug #795

arx · Jul 7, 2016 · d27437d · d27437d
1 parent 7f50e71
commit d27437d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/ArxGame.cpp b/src/core/ArxGame.cpp
@@ -1647,7 +1647,7 @@ void ArxGame::updateInput() {
 	GInput->update();
 
 	// Handle double clicks.
-	const ActionKey & button = config.actions[CONTROLS_CUST_ACTION].key[0];
+	const ActionKey & button = config.actions[CONTROLS_CUST_ACTION];
 	if((button.key[0] != -1 && (button.key[0] & Mouse::ButtonBase)
 	    && GInput->getMouseButtonDoubleClick(button.key[0], 300))
 	   || (button.key[1] != -1 && (button.key[1] & Mouse::ButtonBase)

diff --git a/src/core/Config.h b/src/core/Config.h
@@ -88,7 +88,7 @@ enum UIScaleFilter {
 
 struct ActionKey {
 
-	ActionKey(InputKeyId key_0 = -1, InputKeyId key_1 = -1) {
+	explicit ActionKey(InputKeyId key_0 = -1, InputKeyId key_1 = -1) {
 		key[0] = key_0;
 		key[1] = key_1;
 	}