From 5276a3688e697597df0a9c081199e28e00598fd0 Mon Sep 17 00:00:00 2001
From: Thomas55555 <59625598+Thomas55555@users.noreply.github.com>
Date: Mon, 12 May 2025 09:39:30 +0200
Subject: [PATCH] Fix wrong state in Husqvarna Automower (#144684)

---
 .../components/husqvarna_automower/lawn_mower.py          | 8 ++++----
 tests/components/husqvarna_automower/test_lawn_mower.py   | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/husqvarna_automower/lawn_mower.py b/homeassistant/components/husqvarna_automower/lawn_mower.py
index 9ae214524a7..5a728265651 100644
--- a/homeassistant/components/husqvarna_automower/lawn_mower.py
+++ b/homeassistant/components/husqvarna_automower/lawn_mower.py
@@ -110,14 +110,14 @@ class AutomowerLawnMowerEntity(AutomowerAvailableEntity, LawnMowerEntity):
         mower_attributes = self.mower_attributes
         if mower_attributes.mower.state in PAUSED_STATES:
             return LawnMowerActivity.PAUSED
-        if mower_attributes.mower.state in MowerStates.IN_OPERATION:
-            if mower_attributes.mower.activity == MowerActivities.GOING_HOME:
-                return LawnMowerActivity.RETURNING
-            return LawnMowerActivity.MOWING
         if (mower_attributes.mower.state == "RESTRICTED") or (
             mower_attributes.mower.activity in DOCKED_ACTIVITIES
         ):
             return LawnMowerActivity.DOCKED
+        if mower_attributes.mower.state in MowerStates.IN_OPERATION:
+            if mower_attributes.mower.activity == MowerActivities.GOING_HOME:
+                return LawnMowerActivity.RETURNING
+            return LawnMowerActivity.MOWING
         return LawnMowerActivity.ERROR
 
     @property
diff --git a/tests/components/husqvarna_automower/test_lawn_mower.py b/tests/components/husqvarna_automower/test_lawn_mower.py
index 42b737652b7..c62cf6653c4 100644
--- a/tests/components/husqvarna_automower/test_lawn_mower.py
+++ b/tests/components/husqvarna_automower/test_lawn_mower.py
@@ -37,6 +37,11 @@ from tests.common import MockConfigEntry, async_fire_time_changed
             MowerStates.IN_OPERATION,
             LawnMowerActivity.MOWING,
         ),
+        (
+            MowerActivities.PARKED_IN_CS,
+            MowerStates.IN_OPERATION,
+            LawnMowerActivity.DOCKED,
+        ),
     ],
 )
 async def test_lawn_mower_states(