Skip to content

Commit 21947d0

Browse files
committed
Undo split goes to the end of the group
1 parent 0399bbc commit 21947d0

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ Given these splits: 1 dummy, 2 normal, 3 dummy, 4 dummy, 5 normal, 6 normal.
155155
In this situation you would have only 3 splits in LiveSplit/wsplit (even though there are 6 split images, only 3 are "real" splits). This basically results in 3 groups of splits: 1st split is images 1 and 2. 2nd split is images 3, 4 and 5. 3rd split is image 6.
156156

157157
- If you are in the 1st or 2nd image and press the skip key, it will end up on the 3rd image
158-
- If you are in the 3rd, 4th or 5th image and press the undo key, it will end up on the 1st image
158+
- If you are in the 3rd, 4th or 5th image and press the undo key, it will end up on the 2nd image
159159
- If you are in the 3rd, 4th or 5th image and press the skip key, it will end up on the 6th image
160-
- If you are in the 6th image and press the undo key, it will end up on the 3rd image
160+
- If you are in the 6th image and press the undo key, it will end up on the 5th image
161161

162162
### Loop Split Images
163163

src/AutoControlledWorker.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ def run(self):
2020
except RuntimeError:
2121
self.autosplit.show_error_signal.emit(error_messages.stdin_lost)
2222
break
23+
except EOFError:
24+
continue
2325
# TODO: "AutoSplit Integration" needs to call this and wait instead of outright killing the app.
2426
# For now this can only used in a Development environment
2527
if line == "kill":

src/AutoSplit.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def excepthook(exception_type: type[BaseException], exception: BaseException, _t
5454
sys.exit(0)
5555
autosplit.show_error_signal.emit(lambda: error_messages.exception_traceback(
5656
"AutoSplit encountered an unhandled exception and will try to recover, "
57-
+ f"however, there is no guarantee everything will work properly. {CREATE_NEW_ISSUE_MESSAGE}",
57+
+ f"however, there is no guarantee it will keep working properly. {CREATE_NEW_ISSUE_MESSAGE}",
5858
exception))
5959
return excepthook
6060

@@ -411,9 +411,7 @@ def __check_fps(self):
411411
while count < CHECK_FPS_ITERATIONS:
412412
capture = self.__get_capture_for_comparison()
413413
_ = image.compare_with_capture(self, capture)
414-
set_ui_image(self.current_split_image, image.bytes, True)
415414
count += 1
416-
self.current_split_image.clear()
417415

418416
# calculate FPS
419417
t1 = time()
@@ -437,9 +435,9 @@ def __undo_split(self, navigate_image_only: bool = False):
437435
return
438436

439437
if not navigate_image_only:
440-
for i, group in enumerate(self.split_groups):
438+
for i, group in enumerate(self.split_groups,):
441439
if i > 0 and self.split_image_number in group:
442-
self.split_image_number = self.split_groups[i - 1][0]
440+
self.split_image_number = self.split_groups[i - 1][-1]
443441
break
444442
else:
445443
self.split_image_number -= 1

0 commit comments

Comments
 (0)