Skip to content

Commit 754f1ff

Browse files
Actually fix the livesplit flickering this time
1 parent ab0484a commit 754f1ff

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

SwiftSplit.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@
394394
"$(inherited)",
395395
"@executable_path/../Frameworks",
396396
);
397-
MARKETING_VERSION = 1.1.0;
397+
MARKETING_VERSION = 1.1.1;
398398
PRODUCT_BUNDLE_IDENTIFIER = dev.thecodewarrior.SwiftSplit;
399399
PRODUCT_NAME = "$(TARGET_NAME)";
400400
SWIFT_OBJC_BRIDGING_HEADER = "SwiftSplit/SwiftSplit-Bridging-Header.h";
@@ -421,7 +421,7 @@
421421
"$(inherited)",
422422
"@executable_path/../Frameworks",
423423
);
424-
MARKETING_VERSION = 1.1.0;
424+
MARKETING_VERSION = 1.1.1;
425425
PRODUCT_BUNDLE_IDENTIFIER = dev.thecodewarrior.SwiftSplit;
426426
PRODUCT_NAME = "$(TARGET_NAME)";
427427
SWIFT_OBJC_BRIDGING_HEADER = "SwiftSplit/SwiftSplit-Bridging-Header.h";

SwiftSplit/CelesteSplitter.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ class CelesteSplitter {
5353
let time = routeConfig.useFileTime ? autoSplitterInfo.fileTime : autoSplitterInfo.chapterTime
5454
server.setGameTime(seconds: time)
5555

56+
processEvents(events)
57+
5658
// when using the chapter time, `timerActive` will be true before the chapter time starts ticking.
5759
// This is because the *file* timer is active even before the *chapter* timer is active
5860
let timerActive = autoSplitterInfo.timerActive && time != 0
5961
if timerActive != gameTimeRunning {
6062
server.setGameTime(running: timerActive)
6163
gameTimeRunning = timerActive
6264
}
63-
64-
processEvents(events)
6565
return events
6666
}
6767

@@ -131,6 +131,7 @@ class CelesteSplitter {
131131
if routeIndex == 0 {
132132
server.reset()
133133
server.start()
134+
gameTimeRunning = true
134135
} else if !nextEvent.starts(with: "!") {
135136
server.split()
136137
}

0 commit comments

Comments
 (0)