Fixed SD2-796: Building whilst debugging

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1381 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Main/Base/Project/Src/Commands/BuildCommands.cs

@@ -37,6 +37,15 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		public override void Run()
 		{
 			if (CanRunBuild) {
+				if (DebuggerService.IsDebuggerLoaded && DebuggerService.CurrentDebugger.IsDebugging) {
+					if (MessageService.AskQuestion("${res:XML.MainMenu.RunMenu.Compile.StopDebuggingQuestion}",
+					                               "${res:XML.MainMenu.RunMenu.Compile.StopDebuggingTitle}"))
+					{
+						DebuggerService.CurrentDebugger.Stop();
+					} else {
+						return;
+					}
+				}
 				BeforeBuild();
 				StartBuild();
 			} else {

src/Main/Base/Project/Src/Commands/FileCommands.cs

@@ -26,8 +26,8 @@ namespace ICSharpCode.SharpDevelop.Commands
 		public override void Run()
 		{
 			if (ProjectService.CurrentProject != null) {
-				if (MessageService.ShowCustomDialog("${res:Dialog.NewFile.AddToProjectQuestion}",
-				                                    "${res:Dialog.NewFile.AddToProjectQuestionTitle}",
+				if (MessageService.ShowCustomDialog("${res:Dialog.NewFile.AddToProjectQuestionTitle}",
+				                                    "${res:Dialog.NewFile.AddToProjectQuestion}",
 				                                    "${res:Dialog.NewFile.AddToProjectQuestionProject}",
 				                                    "${res:Dialog.NewFile.AddToProjectQuestionStandalone}")
 				    == 0)

src/Main/Core/Project/Src/Services/MessageService/MessageService.cs

@@ -63,6 +63,8 @@ namespace ICSharpCode.Core
 		
 		public static void ShowError(Exception ex, string message)
 		{
+			if (message == null) message = string.Empty;
+			
 			if (ex != null) {
 				LoggingService.Error(message, ex);
 				if (customErrorReporter != null) {
@@ -73,21 +75,7 @@ namespace ICSharpCode.Core
 				LoggingService.Error(message);
 			}
 			
-			#if DEBUG
-			if (ex != null) {
-				Console.Beep();
-				return;
-			}
-			#endif
-			string msg = String.Empty;
-			
-			if (message != null) {
-				msg += message;
-			}
-			
-			if (message != null && ex != null) {
-				msg += "\n\n";
-			}
+			string msg = message + "\n\n";
 			
 			if (ex != null) {
 				msg += "Exception occurred: " + ex.ToString();