From cced16dff4d98d41b7db8053e0e01333294303f0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 24 Sep 2015 00:01:15 -0700 Subject: [PATCH] Tidy up splash screen code Clearer to just have a spinning thread instead of a timer. --- Misc/SplashScreen.cs | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/Misc/SplashScreen.cs b/Misc/SplashScreen.cs index 929b27f65..3cd2f03d2 100644 --- a/Misc/SplashScreen.cs +++ b/Misc/SplashScreen.cs @@ -1,4 +1,4 @@ -using System.Timers; +using System.Threading; using System.Windows.Forms; namespace PKHeX @@ -8,20 +8,16 @@ public partial class SplashScreen : Form public SplashScreen() { InitializeComponent(); - System.Timers.Timer myTimer = new System.Timers.Timer(); - myTimer.Elapsed += DisplayTimeEvent; - myTimer.Interval = 50; // milliseconds per trigger interval - myTimer.Start(); - } - public void DisplayTimeEvent(object source, ElapsedEventArgs e) - { - if (!Main.init) - if (L_Status.InvokeRequired) L_Status.Invoke((MethodInvoker)delegate { L_Status.Text = Main.Status; }); - else { L_Status.Text = Main.Status; } - else - if (InvokeRequired && IsHandleCreated) - try { Invoke((MethodInvoker)Close); } catch { Close(); } + new Thread(() => + { + while (!Main.init) + Thread.Sleep(50); + + if (InvokeRequired) + try { Invoke((MethodInvoker)Close); } + catch { Close(); } else Close(); + }).Start(); } } } \ No newline at end of file