Skip to content

Commit 70b7f42

Browse files
committed
InputManager: fix issue with A/B/Start/Back in non-debug builds
1 parent f3ac58a commit 70b7f42

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

src/input_manager.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,17 @@ class InputManager
483483
if (!std::filesystem::exists(iniPath))
484484
return false;
485485

486+
spdlog::info(__FUNCTION__ " - reading INI from {}", iniPath.string());
487+
486488
std::vector<std::pair<std::string, std::string>> pad_binds;
487489
std::vector<std::pair<std::string, std::string>> key_binds;
488490

489491
std::ifstream file(iniPath);
490492
if (!file || !file.is_open())
493+
{
494+
spdlog::error(__FUNCTION__ " - failed to read INI, using defaults");
491495
return false;
496+
}
492497

493498
std::string line;
494499
bool inBindingSection = false;
@@ -541,7 +546,12 @@ class InputManager
541546
file.close();
542547

543548
if (key_binds.size() <= 0 && pad_binds.size() <= 0)
549+
{
550+
spdlog::error(__FUNCTION__ " - failed to read binds from INI, using defaults");
544551
return false;
552+
}
553+
554+
spdlog::info(__FUNCTION__ " - {} key binds, {} pad binds", key_binds.size(), pad_binds.size());
545555

546556
// we have binds, reset any of our defaults
547557

@@ -571,7 +581,7 @@ class InputManager
571581
SwitchId switchId = SwitchId::Count;
572582

573583
// is this a volume?
574-
for (int i = 0; i < int(ADChannel::Count); i++)
584+
for (int i = 0; i < 3; i++)
575585
{
576586
if (!stricmp(actionName.c_str(), volumeNames[i].c_str()))
577587
{
@@ -624,7 +634,7 @@ class InputManager
624634
SwitchId switchId = SwitchId::Count;
625635

626636
// Check if it's a volume action
627-
for (int i = 0; i < int(ADChannel::Count); i++)
637+
for (int i = 0; i < 3; i++)
628638
{
629639
if (!stricmp(actionName.c_str(), volumeNames[i].c_str()))
630640
{

0 commit comments

Comments
 (0)