Skip to contentSkip to conversation

gitk: fix race error at click while reading commits

PATCH New Max Kirillov 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gitk: fix race error at click while reading commits

If I click the commit list while reading (or rereading, by Shift-F5) commits, sometimes an error message appears:
`can't read "pending_select": no such variable',
because pending_select is reset during update.

Just removing update or saving value in local variable would result in occasional scrolling to some random commit in history, often very far from the beginning. So nicer choice is skip the selection if change is detected

---
 gitk-git/gitk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
gitk-git/gitk +4 -1
index b3706fc..5a8a57c 100755
@@ -5038,8 +5038,11 @@ proc layoutmore {} {
     }
     if {[info exists pending_select] &&
 	[commitinview $pending_select $curview]} {
+	set save_pending_select $pending_select
 	update
-	selectline [rowofcommit $pending_select] 1
+	if {[info exists pending_select] && $pending_select == $save_pending_select} {
+	    selectline [rowofcommit $save_pending_select] 1
+	}
     }
     drawvisible
 }
Signature · 1 line
1.8.4.rc3.902.g80a4b9e