4 files changed, 11 insertions, 5 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index 1a351d268..4606137f3 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -1274,9 +1274,11 @@ impHandler(undress)
 
     if (sz == 2)
     {
-        const int itemId = atoi(pars[1].c_str());
         if (target != nullptr)
+        {
+            const int itemId = atoi(pars[1].c_str());
             target->undressItemById(itemId);
+        }
     }
     else
     {
diff --git a/src/progs/manaplus/actions/commands.cpp b/src/progs/manaplus/actions/commands.cpp
index dd58c221b..711816eac 100644
--- a/src/progs/manaplus/actions/commands.cpp
+++ b/src/progs/manaplus/actions/commands.cpp
@@ -1036,9 +1036,11 @@ impHandler(homunEmote)
         event.action >= InputAction::HOMUN_EMOTE_1 &&
         event.action <= InputAction::HOMUN_EMOTE_48)
     {
-        const int emotion = event.action - InputAction::HOMUN_EMOTE_1;
         if (emoteShortcut != nullptr)
+        {
+            const int emotion = event.action - InputAction::HOMUN_EMOTE_1;
             homunculusHandler->emote(emoteShortcut->getEmote(emotion));
+        }
         if (Game::instance() != nullptr)
             Game::instance()->setValidSpeed();
         return true;
diff --git a/src/progs/manaplus/actions/pets.cpp b/src/progs/manaplus/actions/pets.cpp
index bb8ec4591..fd8c959f8 100644
--- a/src/progs/manaplus/actions/pets.cpp
+++ b/src/progs/manaplus/actions/pets.cpp
@@ -102,9 +102,11 @@ impHandler(petEmote)
     if (event.action >= InputAction::PET_EMOTE_1
         && event.action <= InputAction::PET_EMOTE_48)
     {
-        const int emotion = event.action - InputAction::PET_EMOTE_1;
         if (emoteShortcut != nullptr)
+        {
+            const int emotion = event.action - InputAction::PET_EMOTE_1;
             petHandler->emote(emoteShortcut->getEmote(emotion));
+        }
         if (Game::instance() != nullptr)
             Game::instance()->setValidSpeed();
         return true;
diff --git a/src/progs/manaplus/gui/viewport.cpp b/src/progs/manaplus/gui/viewport.cpp
index 73a8db226..5483b3d0e 100644
--- a/src/progs/manaplus/gui/viewport.cpp
+++ b/src/progs/manaplus/gui/viewport.cpp
@@ -567,8 +567,6 @@ void Viewport::mousePressed(MouseEvent &event)
     mMousePressX = event.getX();
     mMousePressY = event.getY();
     const MouseButtonT eventButton = event.getButton();
-    const int pixelX = mMousePressX + mPixelViewX;
-    const int pixelY = mMousePressY + mPixelViewY;
 
     // Right click might open a popup
     if (eventButton == MouseButton::RIGHT)
@@ -601,6 +599,8 @@ void Viewport::mousePressed(MouseEvent &event)
         // Find the being nearest to the clicked position
         if (actorManager != nullptr)
         {
+            const int pixelX = mMousePressX + mPixelViewX;
+            const int pixelY = mMousePressY + mPixelViewY;
             Being *const target = actorManager->findNearestLivingBeing(
                 pixelX, pixelY, 20, ActorType::Monster, nullptr);