From cb01daa3a3ac012c308fa6772f68349c302176c3 Mon Sep 17 00:00:00 2001
From: tomaae <23486452+tomaae@users.noreply.github.com>
Date: Sat, 12 Dec 2020 12:54:51 +0100
Subject: [PATCH] Fixed routeros version detection #73 #61

---
 .../mikrotik_router/mikrotik_controller.py    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/custom_components/mikrotik_router/mikrotik_controller.py b/custom_components/mikrotik_router/mikrotik_controller.py
index fce6787..3dbb3c5 100644
--- a/custom_components/mikrotik_router/mikrotik_controller.py
+++ b/custom_components/mikrotik_router/mikrotik_controller.py
@@ -759,18 +759,6 @@ class MikrotikControllerData:
             ],
         )
 
-        if self.data["routerboard"]["firmware"] != "unknown":
-            try:
-                self.major_fw_version = int(
-                    self.data["routerboard"].get("firmware").split(".")[0]
-                )
-            except:
-                _LOGGER.error(
-                    "Mikrotik %s unable to determine major FW version (%s).",
-                    self.host,
-                    self.data["routerboard"].get("firmware"),
-                )
-
     # ---------------------------
     #   get_system_health
     # ---------------------------
@@ -869,6 +857,18 @@ class MikrotikControllerData:
         else:
             self.data["fw-update"]["available"] = False
 
+        if self.data["fw-update"]["installed-version"] != "unknown":
+            try:
+                self.major_fw_version = int(
+                    self.data["fw-update"].get("installed-version").split(".")[0]
+                )
+            except:
+                _LOGGER.error(
+                    "Mikrotik %s unable to determine major FW version (%s).",
+                    self.host,
+                    self.data["fw-update"].get("installed-version"),
+                )
+
     # ---------------------------
     #   get_script
     # ---------------------------