From 925ec61fb6501a4f3ad4367f95a359dad10665ac Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Mon, 24 Feb 2025 00:10:48 +0100
Subject: [PATCH] fixed how the joystick configuration is arranged

---
 config.cpp | 2 --
 multi.cpp  | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.cpp b/config.cpp
index 16ba5c2d..e090b229 100644
--- a/config.cpp
+++ b/config.cpp
@@ -2603,8 +2603,6 @@ EX void showJoyConfig() {
   dialog::addSelItem(XLAT("second joystick: panning speed"), fts(vid.joypanspeed * 1000), 'd');
   dialog::addSelItem(XLAT("smoothen"), its(vid.joysmooth) + " ms", 'e');
 
-  add_edit(joy_init);
-
   dialog::addBreak(50);
   dialog::addBack();
   dialog::display();
diff --git a/multi.cpp b/multi.cpp
index 3388920b..0a41e8c6 100644
--- a/multi.cpp
+++ b/multi.cpp
@@ -478,11 +478,13 @@ struct shmup_configurer {
   #if CAP_SDLJOY
     if(numsticks > 0) {
       if(shmup::on || multi::alwaysuse || players > 1) 
-        dialog::addItem(XLAT("configure joystick axes"), 'j');
+        dialog::addItem(XLAT("configure joystick axes"), 'x');
       else dialog::addBreak(100);
       }
   #endif
   
+    add_edit(joy_init);
+
     dialog::addBreak(50);
   
     dialog::addHelp();