Commit 55198a88d8490309f60f25b36b09ec8be9976f04
2018-07-16T18:00:51
fix tog crash with window resize and scrolling
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/tog/tog.c b/tog/tog.c
index 492ec55..45a8fe0 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -496,19 +496,6 @@ draw_commits(struct commit_queue_entry **last,
char *id_str, *header;
wchar_t *wline;
- entry = first;
- *selected = NULL;
- ncommits = 0;
- while (entry) {
- if (++ncommits - 1 == selected_idx) {
- *selected = entry;
- break;
- }
- entry = TAILQ_NEXT(entry, entry);
- }
- if (*selected == NULL)
- return got_error(GOT_ERR_RANGE);
-
err = got_object_id_str(&id_str, (*selected)->id);
if (err)
return err;
@@ -716,8 +703,11 @@ show_log_view(struct got_object_id *start_id, struct got_repository *repo,
*/
err = queue_commits(graph, &commits, head_id, LINES, 1, repo,
in_repo_path);
- if (err && err->code != GOT_ERR_ITER_COMPLETED)
- goto done;
+ if (err) {
+ if (err->code != GOT_ERR_ITER_COMPLETED)
+ goto done;
+ err = NULL;
+ }
/*
* Find entry corresponding to the first commit to display.
@@ -775,6 +765,8 @@ show_log_view(struct got_object_id *start_id, struct got_repository *repo,
switch (ch) {
case ERR:
if (errno) {
+ if (errno == EINTR)
+ break;
err = got_error_from_errno();
goto done;
}
@@ -834,8 +826,10 @@ show_log_view(struct got_object_id *start_id, struct got_repository *repo,
break;
}
case KEY_RESIZE:
- if (selected > LINES - 1)
+ if (selected > LINES - 2)
selected = LINES - 2;
+ if (selected > commits.ncommits - 1)
+ selected = commits.ncommits - 1;
break;
case KEY_ENTER:
case '\r':