Skip to content

Commit 14f5ab5

Browse files
committed
Don't force selected region for reloading Start Image. Allows start image to load on boot even with missing or invalid region.
1 parent deef4eb commit 14f5ab5

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

‎src/AutoSplit.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,10 @@ def __take_screenshot(self):
662662
def __check_fps(self):
663663
self.fps_value_label.setText("...")
664664
QApplication.processEvents()
665+
if not self.capture_method.check_selected_region_exists():
666+
self.fps_value_label.clear()
667+
error_messages.region()
668+
return
665669
if not (validate_before_parsing(self) and parse_and_validate_images(self)):
666670
self.fps_value_label.clear()
667671
return
@@ -783,7 +787,7 @@ def __check_for_reset_state_update_ui(self):
783787
return True
784788
return False
785789

786-
def __auto_splitter(self): # noqa: C901,PLR0912,PLR0915
790+
def __auto_splitter(self): # noqa: C901,PLR0911,PLR0912,PLR0915
787791
if not self.settings_dict["split_hotkey"] and not self.is_auto_controlled:
788792
self.gui_changes_on_reset(safe_to_reload_start_image=True)
789793
error_messages.split_hotkey()
@@ -792,11 +796,14 @@ def __auto_splitter(self): # noqa: C901,PLR0912,PLR0915
792796
# Set start time before parsing the images as it's a heavy operation that will cause delays
793797
self.run_start_time = time()
794798

799+
if not self.capture_method.check_selected_region_exists():
800+
self.gui_changes_on_reset(safe_to_reload_start_image=True)
801+
error_messages.region()
802+
return
795803
if not (validate_before_parsing(self) and parse_and_validate_images(self)):
796-
# `safe_to_reload_start_image: bool = False`
797-
# because __reload_start_image also does this check,
804+
# `safe_to_reload_start_image=False` because __reload_start_image also does this check,
798805
# we don't want to double a Start/Reset Image error message
799-
self.gui_changes_on_reset()
806+
self.gui_changes_on_reset(safe_to_reload_start_image=False)
800807
return
801808

802809
# Construct a list of images + loop count tuples.

‎src/split_parser.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,6 @@ def validate_before_parsing(autosplit: AutoSplit, *, show_error: bool = True):
273273
error = error_messages.split_image_directory
274274
elif not os.path.isdir(split_image_directory):
275275
error = partial(error_messages.invalid_directory, split_image_directory)
276-
elif not autosplit.capture_method.check_selected_region_exists():
277-
error = error_messages.region
278276
if error and show_error:
279277
error()
280278
return not error

0 commit comments

Comments
 (0)