Fixed crash when changing branches on 10.12

git-up · Sep 1, 2016 · 16d3848 · 16d3848
1 parent 66fd3c1
commit 16d3848
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/GitUp/Application/Document.m b/GitUp/Application/Document.m
@@ -1524,19 +1524,18 @@ - (void)mapViewControllerDidReloadGraph:(GIMapViewController*)controller {
   }
 
   id headBranch = _repository.history.HEADBranch;
-  if (_lastHEADBranch) {
-    if (![headBranch isEqualToBranch:_lastHEADBranch]) {
-      if (!_helpHEADDisabled) {
-        if ([headBranch isKindOfClass:[GCHistoryLocalBranch class]]) {
-          [_windowController showOverlayWithStyle:kGIOverlayStyle_Informational format:NSLocalizedString(@"You are now on branch \"%@\"", nil), [headBranch name]];
-        } else if ((headBranch != [NSNull null]) && (_lastHEADBranch != [NSNull null])) {
-          [_windowController showOverlayWithStyle:kGIOverlayStyle_Informational message:NSLocalizedString(@"You are not on any branch anymore", nil)];
-        }
+  if (headBranch == nil) {
+    headBranch = [NSNull null];
+  }
+  if (![_lastHEADBranch isEqual:headBranch]) {
+    if (!_helpHEADDisabled) {
+      if ([headBranch isKindOfClass:[GCHistoryLocalBranch class]]) {
+        [_windowController showOverlayWithStyle:kGIOverlayStyle_Informational format:NSLocalizedString(@"You are now on branch \"%@\"", nil), [headBranch name]];
+      } else if (headBranch == [NSNull null]) {
+        [_windowController showOverlayWithStyle:kGIOverlayStyle_Informational message:NSLocalizedString(@"You are not on any branch anymore", nil)];
       }
-      _lastHEADBranch = headBranch ? headBranch : [NSNull null];
     }
-  } else {
-    _lastHEADBranch = headBranch ? headBranch : [NSNull null];
+    _lastHEADBranch = headBranch;
   }
 }