Fixed bug: prevent every following upload from beeing started and sto…

…pped immediately, after stopping upload.
Drexel2k · Jun 4, 2020 · 8545348 · 8545348
1 parent 1219afe
commit 8545348
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/VidUp.UI/CommonAssemblyInfo.cs b/VidUp.UI/CommonAssemblyInfo.cs
@@ -7,10 +7,10 @@
 [assembly: System.Reflection.AssemblyProductAttribute("VidUp")]
 [assembly: System.Reflection.AssemblyTitleAttribute("VidUp")]
 [assembly: System.Reflection.AssemblyCompanyAttribute("Drexel Development")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("1.2.0.2")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.2.0.3")]
 //Shown in Gui/Setup
-[assembly: System.Reflection.AssemblyVersionAttribute("1.2.0.2")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2.0.2")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.2.0.3")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2.0.3")]
 [assembly: System.Reflection.AssemblyCopyright("©2020 Drexel Development")]
 [assembly: ComVisible(false)]
 

diff --git a/VidUp.UI/ViewModels/MainWindowViewModel.cs b/VidUp.UI/ViewModels/MainWindowViewModel.cs
@@ -753,7 +753,7 @@ private void stopUploading(object obj)
                 Uploader uploader = this.uploader;
                 if (uploader != null)
                 {
-                    uploader.StopUpload();
+                    uploader.StopUpload = true;
                 }
             }
         }

diff --git a/VidUp.YouTube/Uploader.cs b/VidUp.YouTube/Uploader.cs
@@ -34,6 +34,12 @@ public long MaxUploadInBytesPerSecond
             }
         }
 
+        public bool StopUpload
+        {
+            get => this.stopUpload;
+            set => this.stopUpload = value;
+        }
+
         public Uploader(UploadList uploadList)
         {
             if (uploadList == null)
@@ -74,7 +80,7 @@ public async Task<bool> Upload(Action<Upload> notifyUploadStart, Action<Upload>
             List<Upload> uploadsOfSession = new List<Upload>();
             Upload upload = this.uploadList.GetUpload(PredicateCombiner.Or(predicates.ToArray()));
 
-            while (upload != null)
+            while (upload != null && !this.stopUpload)
             {
                 uploadsOfSession.Add(upload);
                 upload.UploadErrorMessage = null;
@@ -153,11 +159,6 @@ void updateUploadProgress(YoutubeUploadStats stats)
             }
         }
 
-        public void StopUpload()
-        {
-            this.stopUpload = true;
-        }
-
         private bool isStopped()
         {
             return this.stopUpload;