From d81c81de8728862792e88a3f33e5418bccfb653e Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sat, 18 Dec 2021 02:33:13 +0100 Subject: [PATCH] Fixed log not updating when new uncommited changes appear --- src/main/kotlin/app/git/GitManager.kt | 5 +++++ src/main/kotlin/app/ui/log/Log.kt | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/app/git/GitManager.kt b/src/main/kotlin/app/git/GitManager.kt index 87b7b57..c4d757a 100644 --- a/src/main/kotlin/app/git/GitManager.kt +++ b/src/main/kotlin/app/git/GitManager.kt @@ -132,8 +132,13 @@ class GitManager @Inject constructor( if (!operationRunning) { // Only update if there isn't any process running safeProcessing(showError = false) { println("Changes detected, loading status") + val hasUncommitedChanges = statusManager.hasUncommitedChanges.value statusManager.loadHasUncommitedChanges(safeGit) statusManager.loadStatus(safeGit) + + if(!hasUncommitedChanges) { + logManager.loadLog(safeGit) + } } } } diff --git a/src/main/kotlin/app/ui/log/Log.kt b/src/main/kotlin/app/ui/log/Log.kt index b410251..6210881 100644 --- a/src/main/kotlin/app/ui/log/Log.kt +++ b/src/main/kotlin/app/ui/log/Log.kt @@ -88,7 +88,6 @@ fun Log( val commitList = logStatus.plotCommitList val scrollState = rememberLazyListState() - LaunchedEffect(selectedCommit) { // Scroll to commit if a Ref is selected if (selectedItem is SelectedItem.Ref) {