Changed async loading again.

Author: KN4CK3R

Forms/MainForm.cs

@@ -103,9 +103,10 @@ private async void MainForm_FormClosing(object sender, FormClosingEventArgs e)
 			// and cancel all running tasks.
 			if (loadSymbolsTask != null || updateProcessInformationsTask != null)
 			{
-				Hide();
 				e.Cancel = true;
 
+				Hide();
+
 				if (loadSymbolsTask != null)
 				{
 					loadSymbolsTaskToken.Cancel();
@@ -452,21 +453,14 @@ private void MainForm_DragDrop(object sender, DragEventArgs e)
 			}
 		}
 
-		private async void processUpdateTimer_Tick(object sender, EventArgs e)
+		private void processUpdateTimer_Tick(object sender, EventArgs e)
 		{
-			if (updateProcessInformationsTask == null || updateProcessInformationsTask.IsCompleted)
+			if (updateProcessInformationsTask != null && !updateProcessInformationsTask.IsCompleted)
 			{
-				try
-				{
-					updateProcessInformationsTask = remoteProcess.UpdateProcessInformationsAsync();
-
-					await updateProcessInformationsTask;
-				}
-				catch
-				{
-
-				}
+				return;
 			}
+
+			updateProcessInformationsTask = remoteProcess.UpdateProcessInformationsAsync();
 		}
 
 		private void classesView_ClassSelected(object sender, ClassNode node)
@@ -652,7 +646,7 @@ private void LoadFileFromPath(string filePath, ref ReClassNetProject project)
 		}
 
 		/// <summary>Loads all symbols for the current process and displays the progress status.</summary>
-		private async void LoadAllSymbolsForCurrentProcess()
+		private void LoadAllSymbolsForCurrentProcess()
 		{
 			if (loadSymbolsTask != null && !loadSymbolsTask.IsCompleted)
 			{
@@ -671,18 +665,10 @@ private async void LoadAllSymbolsForCurrentProcess()
 			);
 
 			loadSymbolsTaskToken = new CancellationTokenSource();
-			loadSymbolsTask = remoteProcess.LoadAllSymbolsAsync(progress, loadSymbolsTaskToken.Token);
-
-			try
-			{
-				await loadSymbolsTask;
-			}
-			catch
-			{
-
-			}
 
-			infoToolStripStatusLabel.Visible = false;
+			loadSymbolsTask = remoteProcess
+				.LoadAllSymbolsAsync(progress, loadSymbolsTaskToken.Token)
+				.ContinueWith(_ => infoToolStripStatusLabel.Visible = false, TaskScheduler.FromCurrentSynchronizationContext());
 		}
 	}
 }

Memory/RemoteProcess.cs

@@ -537,7 +537,7 @@ public Task LoadAllSymbolsAsync(IProgress<Tuple<Module, IEnumerable<Module>>> pr
 			var copy = modules.ToList();
 
 			// Try to resolve all symbols in a background thread. This can take a long time because symbols are downloaded from the internet.
-			// The COM objects used can only be used in the thread they are created so we can't use them...
+			// The COM objects can only be used in the thread they were created so we can't use them.
 			// Thats why an other task loads the real symbols afterwards in the UI thread context.
 			return Task.Run(
 				() =>
@@ -558,10 +558,7 @@ public Task LoadAllSymbolsAsync(IProgress<Tuple<Module, IEnumerable<Module>>> pr
 				{
 					foreach (var module in copy)
 					{
-						if (token.IsCancellationRequested)
-						{
-							break;
-						}
+						token.ThrowIfCancellationRequested();
 
 						try
 						{