From 97c2f3649104e4af66d87e15247eac804c2a98f4 Mon Sep 17 00:00:00 2001 From: teejusb <5017202+teejusb@users.noreply.github.com> Date: Sat, 1 Mar 2025 23:23:16 -0800 Subject: [PATCH] Remove g_bInputLinuxOrderByLocation preference --- src/arch/InputHandler/LinuxInputManager.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/arch/InputHandler/LinuxInputManager.cpp b/src/arch/InputHandler/LinuxInputManager.cpp index cd69146fb2..4322b41971 100644 --- a/src/arch/InputHandler/LinuxInputManager.cpp +++ b/src/arch/InputHandler/LinuxInputManager.cpp @@ -21,8 +21,6 @@ #include -Preference g_bInputLinuxOrderByLocation( "InputLinuxOrderByLocation", false ); - RString getDevice(RString inputDir, RString type) { RString result = ""; @@ -86,18 +84,9 @@ LinuxInputManager::LinuxInputManager() LOG->Info("LinuxInputManager: %s seems to have no eventNN or jsNN.", dName.c_str() ); } - if(g_bInputLinuxOrderByLocation) - { - // use Presort to sort the devices by unique location (like USB port/hub number.) - PresortPhysical(m_vsPendingEventDevices, "event"); - PresortPhysical(m_vsPendingJoystickDevices, "js"); - } - else - { - // Sort devices for more consistent numbering. - std::sort(m_vsPendingEventDevices.begin(), m_vsPendingEventDevices.end(), cmpDevices); - std::sort(m_vsPendingJoystickDevices.begin(), m_vsPendingJoystickDevices.end(), cmpDevices); - } + // use Presort to sort the devices by unique location (like USB port/hub number.) + PresortPhysical(m_vsPendingEventDevices, "event"); + PresortPhysical(m_vsPendingJoystickDevices, "js"); closedir(sysClassInput); }