Fix crash when try to add suspended account (resolves #22)

mystasly48 · Apr 20, 2020 · 7a1b1f9 · 7a1b1f9
1 parent 033fa85
commit 7a1b1f9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/Mystter_SendTweet/AuthBrowser.cs b/Mystter_SendTweet/AuthBrowser.cs
@@ -25,8 +25,10 @@ public partial class AuthBrowser : Form {
  if (webBrowser1.Url.OriginalString == AuthUrl1 || webBrowser1.Url.OriginalString == AuthUrl2) {
  var r = new Regex(@"<CODE>(\d+)</CODE>");
  var m = r.Match(webBrowser1.DocumentText);
- PIN = m.Result("${1}");
- Success = true;
+ if (m != null) {
+ PIN = m.Result("${1}");
+ Success = true;
+ }
  authorizingLabel.Visible = true;
  webBrowser1.Visible = false;
  webBrowser1.Navigate(LogoutUrl);

diff --git a/Mystter_SendTweet/Form1.cs b/Mystter_SendTweet/Form1.cs
@@ -323,6 +323,8 @@ public partial class Form1 : Form {
  Environment.Exit(0);
  break;
  }
+ } else {
+ MessageBox.Show(Resources.FailedToAddAccount);
  }
  form.Dispose();
  }

diff --git a/Mystter_SendTweet/Languages/Resources.Designer.cs b/Mystter_SendTweet/Languages/Resources.Designer.cs
diff --git a/Mystter_SendTweet/Languages/Resources.ja.resx b/Mystter_SendTweet/Languages/Resources.ja.resx
@@ -222,4 +222,7 @@
  <data name="WindowClosing" xml:space="preserve">
  <value>このウィンドウはまもなく自動で閉じられます...</value>
  </data>
+ <data name="FailedToAddAccount" xml:space="preserve">
+ <value>アカウントの追加に失敗しました。アカウントが有効であることを確認してください。</value>
+ </data>
 </root>
diff --git a/Mystter_SendTweet/Languages/Resources.resx b/Mystter_SendTweet/Languages/Resources.resx
@@ -222,4 +222,7 @@
  <data name="WindowClosing" xml:space="preserve">
  <value>This window will be closed shortly...</value>
  </data>
+ <data name="FailedToAddAccount" xml:space="preserve">
+ <value>Failed to add an account. Please check if your account is valid and try again later.</value>
+ </data>
 </root>