imp - bkp - Improved quiet mode for splashes

--- We've improved the quiet mode by not showing any progress in the kernel splash when quiet mode is enabled. --- Type: imp Breaking: False Doc Required: False Backport Required: True Part: 1/1
Aptivi · Jun 20, 2024 · e7867cf · e7867cf
1 parent 510e210
commit e7867cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/public/Nitrocid/Kernel/Starting/KernelInitializers.cs b/public/Nitrocid/Kernel/Starting/KernelInitializers.cs
@@ -295,7 +295,6 @@ internal static void ResetEverything()
             try
             {
                 // Reset every variable below
-                KernelEntry.QuietKernel = false;
                 SplashReport._Progress = 0;
                 SplashReport._ProgressText = "";
                 SplashReport._KernelBooted = false;
@@ -420,6 +419,9 @@ internal static void ResetEverything()
 
                 // Unload the assembly resolver
                 AppDomain.CurrentDomain.AssemblyResolve -= AssemblyLookup.LoadFromAssemblySearchPaths;
+
+                // Reset quiet state
+                KernelEntry.QuietKernel = false;
             }
         }
     }

diff --git a/public/Nitrocid/Misc/Splash/SplashReport.cs b/public/Nitrocid/Misc/Splash/SplashReport.cs
@@ -199,7 +199,7 @@ public static void ReportProgress(string Text, int Progress, bool force = false,
                 severity == SplashReportSeverity.Warning ? KernelColorType.Warning :
                 severity == SplashReportSeverity.Error ? KernelColorType.Error :
                 KernelColorType.Tip;
-            if (!KernelBooted && (SplashManager.EnableSplash && InSplash || !SplashManager.EnableSplash && !KernelEntry.QuietKernel) || force)
+            if (!KernelBooted && !KernelEntry.QuietKernel && (SplashManager.EnableSplash && InSplash || !SplashManager.EnableSplash) || force)
             {
                 // Check the progress value
                 if (Progress < 0)
@@ -248,7 +248,7 @@ public static void ReportProgress(string Text, int Progress, bool force = false,
                 // Add to the log buffer
                 logBuffer.Add($"[{TimeDateRenderers.Render(FormatType.Short)}] [{_Progress}%] {severity.ToString()[0]}: {TextTools.FormatString(Text, Vars)}");
             }
-            else if (KernelBooted || SplashManager.EnableSplash && !InSplash || !SplashManager.EnableSplash && !KernelEntry.QuietKernel || !SplashManager.EnableSplash)
+            else if (KernelBooted && !KernelEntry.QuietKernel && (SplashManager.EnableSplash && !InSplash || !SplashManager.EnableSplash))
             {
                 DebugWriter.WriteDebug(DebugLevel.I, "Kernel booted or not in splash. Reporting {0}...", Text);
                 TextWriters.Write(Text, true, finalColor, Vars);