X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fconfig.c;h=2704aca5e95e39a6961f04205eec0b72db9effca;hb=b3972d826fe31f82aa3382f80454e5d8ce895705;hp=a621893f419a20c503f49c7423ba6b38c3948a71;hpb=61f66fe0ab7ab4047a2c005fc52afeb50c26fc12;p=libpicofe.git

diff --git a/common/config.c b/common/config.c
index a621893..2704aca 100644
--- a/common/config.c
+++ b/common/config.c
@@ -18,7 +18,7 @@ static char *mystrip(char *str);
 
 #include "menu.h"
 #include "emu.h"
-#include <Pico/Pico.h>
+#include <pico/pico.h>
 
 extern menu_entry opt_entries[];
 extern menu_entry opt2_entries[];
@@ -729,7 +729,8 @@ static void keys_parse(const char *var, const char *val, int binds[32],
 		return;
 	}
 
-	if (binds == currentConfig.KeyBinds && !(keys_encountered & (1<<t))) { // hack
+	// unbind old, but only when key is first encountered
+	if (t < 32 && binds == currentConfig.KeyBinds && !(keys_encountered & (1<<t))) {
 		binds[t] = 0;
 		keys_encountered |= 1<<t;
 	}