diff --git a/Core/RenderManager.cs b/Core/RenderManager.cs index 51a3fbc..d4a68b8 100644 --- a/Core/RenderManager.cs +++ b/Core/RenderManager.cs @@ -192,11 +192,6 @@ namespace ADOFAIRenderer.Core scrController.instance.noFailInfiniteMargin = true; } - timeBase = Time.timeAsDouble; - unscaledTimeBase = Time.unscaledTimeAsDouble; - dspTimeBase = AudioSettings.dspTime; - frameCountBase = Time.frameCount; - StartRendering(); countdown = 3; wonFrame = -1; @@ -387,6 +382,10 @@ namespace ADOFAIRenderer.Core } frameCount = 0; + timeBase = Time.timeAsDouble; + unscaledTimeBase = Time.unscaledTimeAsDouble; + dspTimeBase = AudioSettings.dspTime; + frameCountBase = Time.frameCount; _frameReader?.Dispose(); _frameReader = new FrameReader(); diff --git a/Util/AudioSpectrumGenerator.cs b/Util/AudioSpectrumGenerator.cs index 8b07750..9e27c31 100644 --- a/Util/AudioSpectrumGenerator.cs +++ b/Util/AudioSpectrumGenerator.cs @@ -75,13 +75,7 @@ namespace ADOFAIRenderer.Util public static void GetSpectrumData(float[] samples, int channel, FFTWindow window) { - if (AudioClipData == null || AudioClipData.Length == 0 || scrConductor.instance == null) - { - Array.Clear(samples, 0, samples.Length); - return; - } - - if (!scrConductor.instance.hasSongStarted || scrConductor.instance.song == null) + if (AudioClipData == null || AudioClipData.Length == 0 || !scrConductor.instance || !scrConductor.instance.hasSongStarted || !scrConductor.instance.song) { Array.Clear(samples, 0, samples.Length); return;