Merge pull request #1649 from github/fixes/1620-safemode-and-blend

Fix extension when running in SafeMode / Expression Blend

Author: grokys

src/GitHub.TeamFoundation.14/Base/TeamExplorerServiceHolder.cs

@@ -35,7 +35,10 @@ public TeamExplorerServiceHolder(IVSGitExt gitService)
             syncContext = SynchronizationContext.Current;
 
             UpdateActiveRepo();
-            gitService.ActiveRepositoriesChanged += UpdateActiveRepo;
+            if (gitService != null)
+            {
+                gitService.ActiveRepositoriesChanged += UpdateActiveRepo;
+            }
         }
 
 
@@ -135,7 +138,9 @@ void NotifyActiveRepo()
 
         void UpdateActiveRepo()
         {
-            var repo = gitService.ActiveRepositories.FirstOrDefault();
+            // NOTE: gitService will be null in Expression Blend or Safe Mode
+            var repo = gitService?.ActiveRepositories.FirstOrDefault();
+
             if (!Equals(repo, ActiveRepo))
                 // so annoying that this is on the wrong thread
                 syncContext.Post(r => ActiveRepo = r as ILocalRepositoryModel, repo);