1 files changed, 11 insertions, 1 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 2d9d366b5..f30fab781 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -24,6 +24,7 @@
 #include "dropshortcut.h"
 #include "emoteshortcut.h"
 #include "game.h"
+#include "gamemodifiers.h"
 #include "itemshortcut.h"
 #include "soundmanager.h"
 
@@ -97,6 +98,15 @@
     } \
     return false;
 
+#define callYellowBar2(name) \
+    if (modifiers) \
+    { \
+        modifiers->name(!inputManager.isActionActive( \
+            InputAction::STOP_ATTACK)); \
+        return true; \
+    } \
+    return false;
+
 #define callYellowBarCond(name) \
     if (player_node && !player_node->getDisableGameModifiers()) \
     { \
@@ -499,7 +509,7 @@ impHandler0(setHome)
 
 impHandler0(changeMoveType)
 {
-    callYellowBar(changeMoveType);
+    callYellowBar2(changeMoveType);
 }
 
 impHandler0(changeAttackWeaponType)