commit 7c67cf56d3e4bab38eebe16a51f0ffb790694738
from: Mark Jamsek <mark@jamsek.dev>
via: Stefan Sperling <stsp@stsp.name>
date: Tue Jul 25 16:28:42 2023 UTC

fix occasional test failure in test_log_show_base_commit

Patch by jamsek with a request to commit. Thanks!

commit - 48bfa43b34c38fcf5e33c1e63dbe5dbd8c5865ce
commit + 7c67cf56d3e4bab38eebe16a51f0ffb790694738
blob - 00156e9346ffc307c604c9bb84de75bf7b682777
blob + 7da57bf9f6480d998efd8205b57ef7814af17182
--- tog/tog.c
+++ tog/tog.c
@@ -2429,6 +2429,13 @@ draw_commit(struct tog_view *view, struct commit_queue
 	if (tog_base_commit.id != NULL && tog_base_commit.idx == -1 &&
 	    got_object_id_cmp(id, tog_base_commit.id) == 0)
 		tog_base_commit.idx = entry->idx;
+	if (tog_io.wait_for_ui && s->thread_args.need_commit_marker) {
+		int rc;
+
+		rc = pthread_cond_wait(&s->thread_args.log_loaded, &tog_mutex);
+		if (rc)
+			return got_error_set_errno(rc, "pthread_cond_wait");
+	}
 
 	committer_time = got_object_commit_get_committer_time(commit);
 	if (gmtime_r(&committer_time, &tm) == NULL)
@@ -3910,16 +3917,6 @@ show_log_view(struct tog_view *view)
 			err = trigger_log_thread(view, 1);
 			if (err)
 				return err;
-			if (tog_io.wait_for_ui) {
-				int rc;
-
-				rc = pthread_cond_wait(&s->thread_args.log_loaded,
-				    &tog_mutex);
-				if (rc)
-					return got_error_set_errno(rc,
-					    "pthread_cond_wait");
-				tog_io.wait_for_ui = 0;
-			}
 		}
 	}