v1.62

More bug fixes
murrty · Feb 5, 2018 · 003f6b1 · 003f6b1
1 parent 07788f3
commit 003f6b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Forms/frmAbout.cs b/Forms/frmAbout.cs
@@ -13,6 +13,7 @@
 
 namespace youtube_dl_gui {
     public partial class frmAbout : Form {
+        Thread checkUpdates;
 
         public frmAbout() {
             InitializeComponent();
@@ -22,15 +23,20 @@ private void frmAbout_Shown(object sender, EventArgs e) {
         }
 
         private void llbCheckForUpdates_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
-            Thread checkUpdates = new Thread(() => {
+            checkUpdates = new Thread(() => {
                 decimal cV = Updater.getCloudVersion();
                 if (Updater.isUpdateAvailable(cV)) {
                     if (MessageBox.Show("An update is available.\nNew verison: " + cV.ToString() + " | Your version: " + Properties.Settings.Default.currentVersion.ToString() + "\n\nWould you like to update?", "youtube-dl-gui", MessageBoxButtons.YesNo) == System.Windows.Forms.DialogResult.Yes) {
                         Updater.createUpdaterStub(cV);
                         Updater.runUpdater();
                     }
                 }
+                else {
+                    MessageBox.Show("No update is available at this time.");
+                }
+                this.Invoke((MethodInvoker)(() => checkUpdates.Abort()));
             });
+            checkUpdates.Start();
         }
         private void pbIcon_Click(object sender, EventArgs e) {
             Process.Start("https://github.com/murrty/youtube-dl-gui/");

diff --git a/Forms/frmMain.cs b/Forms/frmMain.cs
@@ -20,8 +20,9 @@ public partial class frmMain : Form {
 
         #region Variables
         bool hasUpdated = false;
-        //bool networkAvailable = true;
         string ytdl = "";
+
+        Thread checkUpdates;
         #endregion
 
         #region Form
@@ -35,16 +36,18 @@ private void frmMain_Load(object sender, EventArgs e) {
             if (File.Exists(System.Windows.Forms.Application.StartupPath + @"\ydgu.bat"))
                 hasUpdated = true;
 
-            if (!Settings.Default.updateCheck) {
-                Thread checkUpdates = new Thread(() => {
+            if (Settings.Default.updateCheck) {
+                checkUpdates = new Thread(() => {
                     decimal cV = Updater.getCloudVersion();
                     if (Updater.isUpdateAvailable(cV)) {
                         if (MessageBox.Show("An update is available.\nNew verison: " + cV.ToString() + " | Your version: " + Properties.Settings.Default.currentVersion.ToString() + "\n\nWould you like to update?", "youtube-dl-gui", MessageBoxButtons.YesNo) == System.Windows.Forms.DialogResult.Yes) {
                             Updater.createUpdaterStub(cV);
                             Updater.runUpdater();
                         }
                     }
+                    this.Invoke((MethodInvoker)(() => checkUpdates.Abort()));
                 });
+                checkUpdates.Start();
             }
 
             if (String.IsNullOrWhiteSpace(Settings.Default.DownloadDir)) {