X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=menu.c;h=929713dc6b553402dcf3f7c38e1210a032a63b09;hb=533726df95e88932d0bf72345a438ae415b8c04e;hp=3cd69d2d2d94f64d420818ec997546ac90cc4a67;hpb=25cfdf0a342a64a01710c1b6fbe3b1b04f28975e;p=libpicofe.git

diff --git a/menu.c b/menu.c
index 3cd69d2..929713d 100644
--- a/menu.c
+++ b/menu.c
@@ -1320,9 +1320,9 @@ static char *action_binds(int player_idx, int action_mask, int dev_id)
 	if (player_idx >= 0) {
 		can_combo = 0;
 		type = IN_BINDTYPE_PLAYER12 + (player_idx >> 1);
+		if (player_idx & 1)
+			action_mask <<= 16;
 	}
-	if (player_idx & 1)
-		action_mask <<= 16;
 
 	if (dev_id >= 0)
 		dev = dev_last = dev_id;
@@ -1459,11 +1459,12 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 
 	dev_id = -1; // show all
 	mask_shift = 0;
-	if (player_idx & 1)
-		mask_shift = 16;
-	bindtype = IN_BINDTYPE_EMU;
-	if (player_idx >= 0)
-	       bindtype = IN_BINDTYPE_PLAYER12 + (player_idx >> 1);
+	if (player_idx >= 0) {
+		if (player_idx & 1)
+			mask_shift = 16;
+		bindtype = IN_BINDTYPE_PLAYER12 + (player_idx >> 1);
+	} else
+		bindtype = IN_BINDTYPE_EMU;
 
 	for (;;)
 	{