From 47e132094c4774ad189eb2736bff4280fce30d29 Mon Sep 17 00:00:00 2001
From: Keith Daulton <keith.daulton@gitkraken.com>
Date: Mon, 19 Dec 2022 21:55:01 -0500
Subject: [PATCH] Fixes commits disappearing from commit details

---
 CHANGELOG.md                                           |  1 +
 src/webviews/commitDetails/commitDetailsWebviewView.ts | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a87d332..4c2bce3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Fixes [#2377](https://github.com/gitkraken/vscode-gitlens/issues/2377) - Missing Azure Devops Icon
 - Fixes [#2380](https://github.com/gitkraken/vscode-gitlens/issues/2380) - Autolink fails with curly braces
 - Fixes [#2381](https://github.com/gitkraken/vscode-gitlens/issues/2381) - can't use scrollbar in 'Commit Graph' view
+- Fixes [#2382](https://github.com/gitkraken/vscode-gitlens/issues/2382) - commits disappearing from commit details view when they shouldn't
 - Fixes an issue where focusout hides toolbar actions for the graph
 - Fixes an issue where _Switch to Another Branch..._ doesn't work in the Graph editor toolbar
 - Fixes graph issue with row highlighting/dimming sticking when the graph loses focus
diff --git a/src/webviews/commitDetails/commitDetailsWebviewView.ts b/src/webviews/commitDetails/commitDetailsWebviewView.ts
index d0b5ef4..71ab970 100644
--- a/src/webviews/commitDetails/commitDetailsWebviewView.ts
+++ b/src/webviews/commitDetails/commitDetailsWebviewView.ts
@@ -688,18 +688,16 @@ export class CommitDetailsWebviewView extends WebviewViewBase<State, Serialized<
 
 		let commit;
 
-		if (window.activeTextEditor == null) {
-			if (getContext('gitlens:webview:graph:active') || getContext('gitlens:webview:rebaseEditor:active')) {
-				commit = this._pendingContext?.commit ?? this._context.commit;
-				if (commit != null) return commit;
-			}
-
+		if (window.activeTextEditor != null) {
 			const { lineTracker } = this.container;
 			const line = lineTracker.selections?.[0].active;
 			if (line != null) {
 				commit = lineTracker.getState(line)?.commit;
 				if (commit != null) return commit;
 			}
+		} else if (getContext('gitlens:webview:graph:active') || getContext('gitlens:webview:rebaseEditor:active')) {
+			commit = this._pendingContext?.commit ?? this._context.commit;
+			if (commit != null) return commit;
 		}
 
 		const { commitsView } = this.container;