Merge pull request #192 from github/fixes/crash-after-publish

Fix race condition causing crash in Publish form

Author: haacked

src/GitHub.App/Controllers/UIController.cs

@@ -293,15 +293,19 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 if (disposed) return;
+                disposed = true;
 
-                Debug.WriteLine("Disposing ({0})", GetHashCode());
-                disposables.Dispose();
-                transition?.Dispose();
-                completion?.Dispose();
                 if (connectionAdded != null)
                     connectionManager.Connections.CollectionChanged -= connectionAdded;
                 connectionAdded = null;
-                disposed = true;
+
+                var tr = transition;
+                var cmp = completion;
+                transition = null;
+                completion = null;
+                disposables.Dispose();
+                tr?.Dispose();
+                cmp?.Dispose();
             }
         }
 

src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs

@@ -117,10 +117,13 @@ void ShowPublish()
             disposable = uiflow;
             var ui = uiflow.Value;
             var creation = ui.SelectFlow(UIControllerFlow.Publish);
-            ui.ListenToCompletionState().Subscribe(done =>
+            bool success = false;
+            ui.ListenToCompletionState().Subscribe(s => success = s, () =>
             {
+                // there's no real cancel button in the publish form, but if support a back button there, then we want to hide the form
                 IsVisible = false;
-                ServiceProvider.TryGetService<ITeamExplorer>()?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
+                if (success)
+                    ServiceProvider.TryGetService<ITeamExplorer>()?.NavigateToPage(new Guid(TeamExplorerPageIds.Home), null);
             });
 
             creation.Subscribe(c =>