From ec3226045565752260ad82d0156e32d1f180a0e9 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Mon, 6 Jun 2022 23:43:35 +0800
Subject: [PATCH] Fix: Confirm dock select (fixed #1048)

---
 module/retire/dock.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/module/retire/dock.py b/module/retire/dock.py
index c6d4305ab..8b49e2131 100644
--- a/module/retire/dock.py
+++ b/module/retire/dock.py
@@ -182,5 +182,16 @@ class Dock(Equipment):
                     break
 
     def dock_select_confirm(self, check_button, skip_first_screenshot=True):
-        return self.ui_click(SHIP_CONFIRM, check_button=check_button, offset=(200, 50),
-                             skip_first_screenshot=skip_first_screenshot)
+        while 1:
+            if skip_first_screenshot:
+                skip_first_screenshot = False
+            else:
+                self.device.screenshot()
+
+            if self.appear(check_button, offset=(30, 30)):
+                break
+
+            if self.appear_then_click(SHIP_CONFIRM, offset=(30, 30), interval=5):
+                continue
+            if self.handle_popup_confirm('DOCK_SELECT_CONFIRM'):
+                continue