fix #524: Reentrancy in 'external change' dialogs

src/Main/Base/Project/Src/Project/ProjectChangeWatcher.cs

@@ -172,8 +172,8 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		static void MainFormActivated()
 		{
-			if (wasChangedExternally && !showingMessageBox) {
+			if (wasChangedExternally) {
-
+				if (!showingMessageBox) {
 					if (ProjectService.OpenSolution != null) {
 						// Set wasChangedExternally=false only after the dialog is closed,
 						// so that additional changes to the project while the dialog is open
@@ -186,14 +186,23 @@ namespace ICSharpCode.SharpDevelop.Project
 						int result = MessageService.ShowCustomDialog(MessageService.DefaultMessageBoxTitle, "${res:ICSharpCode.SharpDevelop.Project.SolutionAlteredExternallyMessage}", 0, 1, "${res:ICSharpCode.SharpDevelop.Project.ReloadSolution}", "${res:ICSharpCode.SharpDevelop.Project.KeepOldSolution}", "${res:ICSharpCode.SharpDevelop.Project.CloseSolution}");
 						showingMessageBox = false;
 						wasChangedExternally = false;
-					if (result == 0)
+						if (result == 1) {
+							FileChangeWatcher.AskForReload();
+						} else {
+							FileChangeWatcher.CancelReloadQueue();
+							if (result == 0) {
 								SD.ProjectService.OpenSolutionOrProject(ProjectService.OpenSolution.FileName);
-					else if (result == 2)
+							} else {
 								new CloseSolution().Run();
+							}
+						}
 					} else {
 						wasChangedExternally = false;
 					}
 				}
+			} else {
+				FileChangeWatcher.AskForReload();
+			}
 		}
 
 		bool disposed;

src/Main/Base/Project/Workbench/FileChangeWatcher.cs

@@ -18,10 +18,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Windows.Forms;
-using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.Core;
 
 namespace ICSharpCode.SharpDevelop.Workbench
@@ -207,13 +204,44 @@ namespace ICSharpCode.SharpDevelop.Workbench
 				if (!File.Exists(fileName))
 					return;
 
+				if (AutoLoadExternalChangesOption && !file.IsDirty) {
+					if (File.Exists(fileName)) {
+						file.ReloadFromDisk();
+					}
+				} else {
+					QueueFileForReloadDialog(file);
+				}
+			}
+		}
+		
+		#region Reload Queue
+		static readonly HashSet<OpenedFile> queue = new HashSet<OpenedFile>();
+		static volatile bool currentlyReloading;
+		
+		static void QueueFileForReloadDialog(OpenedFile file)
+		{
+			if (file == null)
+				throw new ArgumentNullException("file");
+			lock (queue) {
+				queue.Add(file);
+			}
+		}
+		
+		public static void AskForReload()
+		{
+			if (currentlyReloading) return;
+			currentlyReloading = true;
+			try {
+				lock (queue) {
+					foreach (var file in queue) {
+						string fileName = file.FileName;
+						if (!File.Exists(fileName))
+							continue;
 						string message = StringParser.Parse(
 							"${res:ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding.FileAlteredMessage}",
 							new StringTagPair("File", Path.GetFullPath(fileName))
 						);
-				if ((AutoLoadExternalChangesOption && file.IsDirty == false)
+						if (SD.MessageService.AskQuestion(message, StringParser.Parse("${res:MainWindow.DialogName}"))) {
-				    || MessageService.AskQuestion(message, StringParser.Parse("${res:MainWindow.DialogName}")))
-				{
 							if (File.Exists(fileName)) {
 								file.ReloadFromDisk();
 							}
@@ -221,6 +249,19 @@ namespace ICSharpCode.SharpDevelop.Workbench
 							file.MakeDirty();
 						}
 					}
+					queue.Clear();
+				}
+			} finally {
+				currentlyReloading = false;
+			}
+		}
+
+		public static void CancelReloadQueue()
+		{
+			lock (queue) {
+				queue.Clear();
+			}
 		}
+		#endregion
 	}
 }