Merge pull request #1 from pjf/394_tests

Extra tests for GameData pathed installs
RichardLake · Nov 18, 2014 · 8eecb14 · 8eecb14
2 parents 139017e + e0fb6e4
commit 8eecb14
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/ModuleInstaller.cs b/ModuleInstaller.cs
@@ -157,7 +157,8 @@ public static string CachedOrDownload(string identifier, Version version, Uri ur
         // TODO: Break this up into smaller pieces! It's huge!
         public void InstallList(
             List<string> modules,
-            RelationshipResolverOptions options
+            RelationshipResolverOptions options,
+            NetAsyncDownloader downloader = null
         )
         {
             onReportProgress = onReportProgress ?? ((message, progress) => { });
@@ -195,7 +196,11 @@ RelationshipResolverOptions options
 
             if (downloads.Count > 0)
             {
-                var downloader = new NetAsyncDownloader();
+                if (downloader == null)
+                {
+                    downloader = new NetAsyncDownloader();
+                }
+
                 downloader.DownloadModules(ksp.Cache, downloads, onReportProgress);
             }
 

diff --git a/Net/NetAsyncDownloader.cs b/Net/NetAsyncDownloader.cs
@@ -159,6 +159,11 @@ public void DownloadModules(
             // If the user cancelled our progress, then signal that.
             if (downloadCanceled)
             {
+                foreach (var download in downloads)
+                {
+                    download.agent.CancelAsync();
+                }
+
                 throw new CancelledActionKraken("Download cancelled by user");
             }
 
@@ -242,17 +247,17 @@ public void CancelDownload()
         {
             log.Debug("Cancelling download");
 
-            foreach (var download in downloads)
+            downloadCanceled = true;
+
+            lock (download_complete_lock)
             {
-                download.agent.CancelAsync();
+               Monitor.Pulse(download_complete_lock);
             }
 
             if (onCompleted != null)
             {
                 onCompleted(null, null, null);
             }
-
-            downloadCanceled = true;
         }
 
         /// <summary>