Don't wait for commands unless they're ready to activate

Author: Therzok

main/tests/UserInterfaceTests/Ide.cs

@@ -52,12 +52,20 @@ public static void OpenFile (FilePath file)
 
 		public static void CloseAll (bool exit = true)
 		{
-			Session.RunAndWaitForTimer (() => {
-				Session.ExecuteCommand (FileCommands.SaveAll);
-			}, "Ide.Shell.SaveAll");
-			Session.RunAndWaitForTimer (() => {
-				Session.ExecuteCommand (FileCommands.CloseWorkspace);
-			}, "Ide.Shell.CloseWorkspace");
+			var isDirty = (bool)Session.GetGlobalValue ("MonoDevelop.Ide.IdeApp.Workbench.DocumentsDirty");
+			if (isDirty) {
+				Session.RunAndWaitForTimer (() => {
+					Session.ExecuteCommand (FileCommands.SaveAll);
+				}, "Ide.Shell.SaveAll");
+			}
+
+			var workspaceOpen = (bool)Session.GetGlobalValue ("MonoDevelop.Ide.IdeApp.Workspace.IsOpen");
+			if (workspaceOpen) {
+				Session.RunAndWaitForTimer (() => {
+					Session.ExecuteCommand (FileCommands.CloseWorkspace);
+				}, "Ide.Shell.CloseWorkspace");
+			}
+
 			if (exit)
 				Session.ExitApp ();
 		}