From 6d9534c41d796dc222b5bec6e9fdd8c4961c0176 Mon Sep 17 00:00:00 2001
From: positnuec <93694981+positnuec@users.noreply.github.com>
Date: Sat, 1 Aug 2026 17:20:59 +0800
Subject: [PATCH] Fix: get_oil() timeout check should run before oil icon check

---
 module/campaign/campaign_status.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/campaign/campaign_status.py b/module/campaign/campaign_status.py
index fb5255778..f28e52373 100644
--- a/module/campaign/campaign_status.py
+++ b/module/campaign/campaign_status.py
@@ -125,15 +125,15 @@ class CampaignStatus(UI):
             else:
                 self.device.screenshot()
 
-            if not self.appear(OCR_OIL_CHECK, offset=(10, 2)):
-                logger.info('No oil icon')
-                continue
-
             if timeout.reached():
                 logger.warning('Get oil timeout')
                 oil = 0
                 break
 
+            if not self.appear(OCR_OIL_CHECK, offset=(10, 2)):
+                logger.info('No oil icon')
+                continue
+
             oil = self._get_num(OCR_OIL, 'OCR_OIL', (247, 247, 247))
             if last_oil == oil and oil >= 100:
                 break