Moved profile change event to setProfile

OpenStickCommunity · Dec 28, 2024 · 2554f90 · 2554f90
1 parent 87a733a
commit 2554f90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/configs/webconfig.cpp b/src/configs/webconfig.cpp
@@ -648,8 +648,6 @@ std::string setGamepadOptions()
 
     GamepadOptions& gamepadOptions = Storage::getInstance().getGamepadOptions();
 
-    uint8_t prevProfileNumber = gamepadOptions.profileNumber;
-
     readDoc(gamepadOptions.dpadMode, doc, "dpadMode");
     readDoc(gamepadOptions.inputMode, doc, "inputMode");
     readDoc(gamepadOptions.socdMode, doc, "socdMode");
@@ -671,7 +669,6 @@ std::string setGamepadOptions()
     readDoc(gamepadOptions.xinputAuthType, doc, "xinputAuthType");
     readDoc(gamepadOptions.ps4ControllerIDMode, doc, "ps4ControllerIDMode");
 
-    EventManager::getInstance().triggerEvent(new GPProfileChangeEvent(prevProfileNumber, gamepadOptions.profileNumber));
 
     HotkeyOptions& hotkeyOptions = Storage::getInstance().getHotkeyOptions();
     save_hotkey(&hotkeyOptions.hotkey01, doc, "hotkey01");

diff --git a/src/storagemanager.cpp b/src/storagemanager.cpp
@@ -8,6 +8,7 @@
 #include "BoardConfig.h"
 #include "AnimationStorage.hpp"
 #include "FlashPROM.h"
+#include "eventmanager.h"
 #include "peripheralmanager.h"
 #include "config.pb.h"
 #include "hardware/watchdog.h"
@@ -130,6 +131,7 @@ bool Storage::setProfile(const uint32_t profileNum)
 		// is this profile enabled?
 		// profile 1 (core) is always enabled, others we must check
 		if (profileNum == 1 || config.profileOptions.gpioMappingsSets[profileNum-2].enabled) {
+			EventManager::getInstance().triggerEvent(new GPProfileChangeEvent(this->config.gamepadOptions.profileNumber, profileNum));
 			this->config.gamepadOptions.profileNumber = profileNum;
 			return true;
 		}