From: Ingo Ruhnke <grumbel@gmail.com>
Date: Fri, 29 Aug 2014 21:04:10 +0000 (+0200)
Subject: Don't clear the keymap when loading from file so that the default config is preserved
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=2372988b5c58303f17720945e14d48c7aebc95ee;p=supertux.git

Don't clear the keymap when loading from file so that the default config is preserved
---

diff --git a/src/control/keyboard_config.cpp b/src/control/keyboard_config.cpp
index db6114a88..a8ec960ab 100644
--- a/src/control/keyboard_config.cpp
+++ b/src/control/keyboard_config.cpp
@@ -54,7 +54,6 @@ KeyboardConfig::read(const lisp::Lisp& keymap_lisp)
   keymap_lisp.get("sdl2", config_is_sdl2);
   if (config_is_sdl2)
   {
-    keymap.clear();
     keymap_lisp.get("jump-with-up", jump_with_up_kbd);
     lisp::ListIterator iter(&keymap_lisp);
     while(iter.next())