Actually fix the livesplit flickering this time

thecodewarrior · Dec 7, 2020 · 754f1ff · 754f1ff
1 parent ab0484a
commit 754f1ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/SwiftSplit.xcodeproj/project.pbxproj b/SwiftSplit.xcodeproj/project.pbxproj
@@ -394,7 +394,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.thecodewarrior.SwiftSplit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SwiftSplit/SwiftSplit-Bridging-Header.h";
@@ -421,7 +421,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.thecodewarrior.SwiftSplit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SwiftSplit/SwiftSplit-Bridging-Header.h";

diff --git a/SwiftSplit/CelesteSplitter.swift b/SwiftSplit/CelesteSplitter.swift
@@ -53,15 +53,15 @@ class CelesteSplitter {
         let time = routeConfig.useFileTime ? autoSplitterInfo.fileTime : autoSplitterInfo.chapterTime
         server.setGameTime(seconds: time)
 
+        processEvents(events)
+
         // when using the chapter time, `timerActive` will be true before the chapter time starts ticking.
         // This is because the *file* timer is active even before the *chapter* timer is active
         let timerActive = autoSplitterInfo.timerActive && time != 0
         if timerActive != gameTimeRunning {
             server.setGameTime(running: timerActive)
             gameTimeRunning = timerActive
         }
-
-        processEvents(events)
         return events
     }
 
@@ -131,6 +131,7 @@ class CelesteSplitter {
                     if routeIndex == 0 {
                         server.reset()
                         server.start()
+                        gameTimeRunning = true
                     } else if !nextEvent.starts(with: "!") {
                         server.split()
                     }