Prevent NullReferenceException on login when account is not found

Jessecar96 · Jun 17, 2017 · be349ae · be349ae
1 parent 820c597
commit be349ae
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/Steam Desktop Authenticator/LoginForm.cs b/Steam Desktop Authenticator/LoginForm.cs
@@ -15,15 +15,23 @@ public LoginForm(LoginType loginReason = LoginType.Initial, SteamGuardAccount ac
             this.LoginReason = loginReason;
             this.androidAccount = account;
 
-            if (this.LoginReason != LoginType.Initial)
+            try
             {
-                txtUsername.Text = account.AccountName;
-                txtUsername.Enabled = false;
-            }
+                if (this.LoginReason != LoginType.Initial)
+                {
+                    txtUsername.Text = account.AccountName;
+                    txtUsername.Enabled = false;
+                }
 
-            if (this.LoginReason == LoginType.Refresh)
+                if (this.LoginReason == LoginType.Refresh)
+                {
+                    labelLoginExplanation.Text = "Your Steam credentials have expired. For trade and market confirmations to work properly, please login again.";
+                }
+            }
+            catch (Exception)
             {
-                labelLoginExplanation.Text = "Your Steam credentials have expired. For trade and market confirmations to work properly, please login again.";
+                MessageBox.Show("Failed to find your account. Try closing and re-opening SDA.", "Login Failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                this.Close();
             }
         }