Merge pull request #349 from mrmin123/staging

7.3.1 to master
perryhuynh · Jan 26, 2019 · d1dea2c · d1dea2c
2 parents bfc3c36 + dbc9b56
commit d1dea2c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### 7.3.1
+
+* Dial back the aggressiveness of whitescreen crash detection
+
 #### 7.3.0
 
 * Archive 2019 Winter Event assets

diff --git a/docs/bundle.js b/docs/bundle.js
diff --git a/kcauto.sikuli/recovery.py b/kcauto.sikuli/recovery.py
@@ -75,7 +75,7 @@ def recover(cls, kcauto, config, e):
         if kc_region.exists('catbomb.png', 30):
             if cls._handle_catbomb(kcauto, kc_region):
                 return True
-        if kc_region.exists('whitescreen.png', 30):
+        if kc_region.exists(Pattern('whitescreen.png').exact(), 30):
             if cls._handle_whitescreen(kcauto, kc_region):
                 return True
 
@@ -236,7 +236,7 @@ def _start_kancolle(cls, kcauto, kc_region):
             kc_region.wait('home_menu_resupply.png', 60)
             Util.log_success("Game restarted.")
             return True
-        elif kc_region.exists('whitescreen.png', 30):
+        elif kc_region.exists(Pattern('whitescreen.png').exact(), 30):
             return cls._handle_whitescreen(kcauto, kc_region)
         return False
 
@@ -275,7 +275,6 @@ def _start_crash_observer(self):
         """
         self.kc_region.onAppear('catbomb.png', self._set_crash_detected)
         self.kc_region.onAppear('chrome_crash.png', self._set_crash_detected)
-        self.kc_region.onAppear('whitescreen.png', self._set_crash_detected)
         self.kc_region.observeInBackground(FOREVER)
 
     def _stop_crash_observer(self):

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kcauto",
-  "version": "7.3.0",
+  "version": "7.3.1",
   "main": "index.js",
   "repository": "git@gitlab.com:mrmin123/kcauto.git",
   "author": "mrmin123 <minyoung.choi@gmail.com>",