1 files changed, 27 insertions, 25 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs
index 5bc6c0215d..7db2b7aef8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs
@@ -23,17 +23,17 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:2.0.50727.3074

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-using System;

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3074
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using MonoDevelop.Core;
@@ -42,12 +42,12 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Navigation;
 using MonoDevelop.Ide.TextEditing;
-using MonoDevelop.Ide.Desktop;

-

-namespace MonoDevelop.Ide.Tasks

-{

-	public class TaskStore: IEnumerable<TaskListEntry>, ILocationList

-	{

+using MonoDevelop.Ide.Desktop;
+
+namespace MonoDevelop.Ide.Tasks
+{
+	public class TaskStore: IEnumerable<TaskListEntry>, ILocationList
+	{
 		int taskUpdateCount;
 		List<TaskListEntry> tasks = new List<TaskListEntry> ();
 		Dictionary<FilePath,TaskListEntry[]> taskIndex = new Dictionary<FilePath, TaskListEntry[]> ();
@@ -59,11 +59,13 @@ namespace MonoDevelop.Ide.Tasks
 		List<TaskListEntry> tasksAdded;
 		List<TaskListEntry> tasksRemoved;
 		
-		public TaskStore ()

-		{

-			IdeApp.Workspace.FileRenamedInProject += ProjectFileRenamed;
-			IdeApp.Workspace.FileRemovedFromProject += ProjectFileRemoved;
-			
+		public TaskStore ()
+		{
+			if (IdeApp.Workspace != null) {
+				IdeApp.Workspace.FileRenamedInProject += ProjectFileRenamed;
+				IdeApp.Workspace.FileRemovedFromProject += ProjectFileRemoved;
+			}
+
 			TextEditorService.LineCountChangesCommitted += delegate (object sender, TextFileEventArgs args) {
 				foreach (TaskListEntry task in GetFileTasks (args.TextFile.Name.FullPath))
 					task.SavedLine = -1;
@@ -198,7 +200,7 @@ namespace MonoDevelop.Ide.Tasks
 					yield return t;
 			}
 		}
-

+
 		public TaskListEntry[] GetFileTasks (FilePath file)
 		{
 			TaskListEntry[] ta;
@@ -523,7 +525,7 @@ namespace MonoDevelop.Ide.Tasks
 		}
 		
 		#endregion
-	}

+	}
 		
 	public delegate void TaskEventHandler (object sender, TaskEventArgs e);
 	
@@ -545,4 +547,4 @@ namespace MonoDevelop.Ide.Tasks
 			get { return tasks; }
 		}
 	}
-}

+}