From 6817dec0b405b325a2762e352ad2a5916c24542a Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 31 Jul 2016 14:14:25 +0200
Subject: Added reset_controls function to revert to the default keyboard
 configuration, don't override unbound keys with default binds.

---
 src/client/control.cc | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/client/control.cc')

diff --git a/src/client/control.cc b/src/client/control.cc
index ab8c99f..0393333 100644
--- a/src/client/control.cc
+++ b/src/client/control.cc
@@ -5,15 +5,26 @@
 */
 
 #include "client/control.h"
+#include <cassert>
 
 namespace client
 {
 
 Control::Control(const char *name, const char *command, const char *keyname)
 {	
+	assert(name);
 	_name.assign(name);
-	_command.assign(command);
-	_keyname.assign(keyname);
+	
+	if (command)
+	{
+		_command.assign(command);
+	}
+	
+	if (keyname)
+	{
+		_keyname.assign(keyname);
+		_defaultkeyname.assign(keyname);
+	}
 }
 
 Control::~Control()
-- 
cgit v1.2.3