Small prerelease change

BRH-Media · Jul 3, 2020 · 17c7abe · 17c7abe
1 parent 1e8e88e
commit 17c7abe
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 9 deletions.
diff --git a/PlexDL.PlexAPI.LoginHandler/LoginWindow.Designer.cs b/PlexDL.PlexAPI.LoginHandler/LoginWindow.Designer.cs
diff --git a/PlexDL.PlexAPI.LoginHandler/LoginWindow.cs b/PlexDL.PlexAPI.LoginHandler/LoginWindow.cs
@@ -41,14 +41,19 @@ private void TmrDotChange_Tick(object sender, EventArgs e)
             pbMain.Text = dots;
         }
 
-        private void LoginWindow_Load(object sender, EventArgs e)
+        private void LaunchBrowser()
         {
-            tmrDotChange.Start();
             var endp = PlexRequestPin.LoginInterfaceUrl;
             //show in default browser
             Process.Start(endp);
         }
 
+        private void LoginWindow_Load(object sender, EventArgs e)
+        {
+            tmrDotChange.Start();
+            LaunchBrowser();
+        }
+
         private void BtnOK_Click(object sender, EventArgs e)
         {
             try
@@ -74,5 +79,10 @@ private void BtnOK_Click(object sender, EventArgs e)
                 UIMessages.Error($"An error occured whilst logging into Plex.tv:\n\n{ex}");
             }
         }
+
+        private void LnkRelaunch_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            LaunchBrowser();
+        }
     }
 }
diff --git a/PlexDL.WaitWindow/WaitWindowGUI.cs b/PlexDL.WaitWindow/WaitWindowGUI.cs
@@ -14,11 +14,12 @@ internal class WaitWindowGUI : Form
         private readonly WaitWindow _Parent;
         internal Exception _Error;
 
+        private int _dotCount = 0;
+
         internal object _Result;
 
         private IContainer components;
 
-        private int dotCount;
         private string LabelText = "";
 
         public Label MessageLabel;
@@ -62,8 +63,7 @@ internal object DoWork()
         {
             //	Invoke the worker method and return any results.
             var e = new WaitWindowEventArgs(_Parent, _Parent._Args);
-            if (_Parent._WorkerMethod != null)
-                _Parent._WorkerMethod(this, e);
+            _Parent._WorkerMethod?.Invoke(this, e);
 
             return e.Result;
         }
@@ -198,6 +198,7 @@ private void InitializeComponent()
 
         private void WaitWindowGUI_Load(object sender, EventArgs e)
         {
+            _dotCount = 0;
             tmrDots.Start();
         }
 
@@ -206,16 +207,18 @@ private void WaitWindowGUI_FormClosing(object sender, FormClosingEventArgs e)
             tmrDots.Stop();
         }
 
+
+
         private void TmrDots_Tick(object sender, EventArgs e)
         {
-            if (dotCount < 3)
+            if (_dotCount < 3)
             {
-                dotCount++;
-                MessageLabel.Text += @".";
+                _dotCount++;
+                MessageLabel.Text += '.';
             }
             else
             {
-                dotCount = 0;
+                _dotCount = 0;
                 MessageLabel.Text = LabelText;
             }
         }