bugfix: predictor PreventSendStateToStudio not working properly

Author: LozenChen

Source/Module/WhatsNew.cs

@@ -91,6 +91,7 @@ public static void CreateUpdateLog() {
         AddLog("2.1.3", "Bugfix: Incompatibility with MotionSmoothing in event ch09_goto_the_future. (thanks @cameryn)");
         AddLog("2.1.4", "Bugfix: Fastforward makes spinner colors change. (thanks @trans_alexa)");
         AddLog("2.1.5", "Bugfix: fix a bug caused by CelesteTAS refactor.");
+        AddLog("2.1.6", "Bugfix: When predictor Update-on-Tas-File-Changed enabled, and edit a line above the current frame, it'll move selection to the current frame. (thanks @richconnergmn)");
         UpdateLogs.Sort((x, y) => new Version(y.Item1).CompareTo(new Version(x.Item1)));
     }
 

Source/Predictor/PredictorCore.cs

@@ -182,7 +182,6 @@ public static void Initialize() {
             if (StrictFrameStep && TasHelperSettings.PredictOnFrameStep && Engine.Scene is Level) {
                 Predict(TasHelperSettings.TimelineLength + CacheFuturePeriod, false);
             }
-            ClearPreventSendStateToStudio();
         });
 
         typeof(Level).GetMethod("BeforeRender").HookBefore(DelayedActions);
@@ -308,18 +307,20 @@ private static void DelayedClearState() {
         }
     }
     private static void DelayedPredict() {
-        if (hasDelayedPredict && !InPredict) {
+        if (hasDelayedPredict && !InPredict) {
+            preventSendStateToStudio = true;
             RefreshInputs();
             GameInfo.Update();
             Predict(TasHelperSettings.TimelineLength + CacheFuturePeriod, delayedMustRedo);
-            hasDelayedPredict = false;
+            hasDelayedPredict = false;
+            preventSendStateToStudio = false;
         }
         // we shouldn't do this in half of the render process
 
-        void RefreshInputs() {
+        void RefreshInputs() {
+
             InputController c = Manager.Controller;
             c.NeedsReload = true;
-            preventSendStateToStudio = true;
 
             int lastChecksum = c.Checksum;
             bool firstRun = c.UsedFiles.IsEmpty();
@@ -347,7 +348,8 @@ void RefreshInputs() {
                 c.Clear();
             }
 
-            c.CurrentFrameInTas = Math.Min(c.Inputs.Count, c.CurrentFrameInTas);
+            c.CurrentFrameInTas = Math.Min(c.Inputs.Count, c.CurrentFrameInTas);
+
         }
     }
 
@@ -359,12 +361,6 @@ private static bool preventSendStateToStudio {
     }
 
 
-    [EnableRun]
-    [DisableRun]
-    private static void ClearPreventSendStateToStudio() {
-        preventSendStateToStudio = false;
-    }
-
     public static bool SkipPredictCheck() {
         foreach (Func<bool> check in SkipPredictChecks) {
             if (check()) {