Merge pull request #7629 from mono/fix-896537

[Shell] Show an alert in StatusMonitor if the Workbench is not visible

1 files changed, 11 insertions, 7 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlTask.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlTask.cs
index 22ff7b7012..2effe8980d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlTask.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlTask.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
-using Gtk;
-
 using MonoDevelop.Core;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.VersionControl
 {
@@ -56,11 +54,9 @@ namespace MonoDevelop.VersionControl
 						tracker.ReportError (msg + exception.Message, null);
 						LoggingService.LogError ("Version Control command failed: ", exception);
 					} else if (exception is VersionControlException) {
-						var msg = GettextCatalog.GetString ("Version control operation failed: ");
-						tracker.ReportError (msg + exception.Message, exception);
+						ReportError (exception.Message, exception);
 					} else {
-						var msg = GettextCatalog.GetString ("Version control operation failed: ");
-						tracker.ReportError (msg, exception);
+						ReportError (exception.Message, exception);
 					}
 				}
 				Wakeup ();
@@ -83,5 +79,13 @@ namespace MonoDevelop.VersionControl
 		protected void Warn(string logtext) {
 			tracker.ReportWarning(logtext);
 		}
+
+		void ReportError (string message, Exception exception)
+		{
+			string msg = GettextCatalog.GetString ("Version control operation failed");
+			tracker.ReportError ($"{msg}: {message}", exception);
+			if (IdeApp.Workbench.RootWindow?.Visible == false)
+				MessageService.ShowError (msg, message, exception);
+		}
 	}
 }