* [PATCH] gitk: check main window visibility before waiting for it to show
@ 2021-01-09 23:26 Tobias Pietzsch via GitGitGadget
2021-01-10 22:23 ` Beat Bolli
0 siblings, 1 reply; 2+ messages in thread
From: Tobias Pietzsch via GitGitGadget @ 2021-01-09 23:26 UTC (permalink / raw)
To: git; +Cc: Paul Mackerras, Tobias Pietzsch, Tobias Pietzsch
From: Tobias Pietzsch <pietzsch@mycroft.speedport.ip>
If the main window is already visible when gitk waits for it to
become visible, gitk hangs forever.
This commit adds a check whether the window is already visible.
See https://wiki.tcl-lang.org/page/tkwait+visibility
Signed-off-by: Tobias Pietzsch <pietzsch@mycroft.speedport.ip>
---
gitk: check main window visibility before waiting for it to show
If the main window is already visible when gitk waits for it to become
visible, gitk hangs forever.
This commit adds a check whether the window is already visible. See
https://wiki.tcl-lang.org/page/tkwait+visibility
The symptom of the for-ever waiting is that gitk shows just an empty
window, like this: https://tinyurl.com/yxr5qlf6 It happens (to me) on
macOS 11.1 with git-gui installed via homebrew. It doesn't happen on
macOS 10.14.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-944%2Ftpietzsch%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-944/tpietzsch/master-v1
Pull-Request: https://github.com/git/git/pull/944
gitk-git/gitk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 23d9dd1fe0d..cd02b4d50fc 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -12658,7 +12658,7 @@ catch {
wm iconphoto . -default gitlogo gitlogo32
}
# wait for the window to become visible
-tkwait visibility .
+if {![winfo viewable .]} {tkwait visibility .}
set_window_title
update
readrefs
base-commit: 72c4083ddf91b489b7b7b812df67ee8842177d98
--
gitgitgadget
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gitk: check main window visibility before waiting for it to show
2021-01-09 23:26 [PATCH] gitk: check main window visibility before waiting for it to show Tobias Pietzsch via GitGitGadget
@ 2021-01-10 22:23 ` Beat Bolli
0 siblings, 0 replies; 2+ messages in thread
From: Beat Bolli @ 2021-01-10 22:23 UTC (permalink / raw)
To: Tobias Pietzsch via GitGitGadget, git
Cc: Paul Mackerras, Tobias Pietzsch, Tobias Pietzsch
On 10.01.21 00:26, Tobias Pietzsch via GitGitGadget wrote:
> From: Tobias Pietzsch <pietzsch@mycroft.speedport.ip>
>
> If the main window is already visible when gitk waits for it to
> become visible, gitk hangs forever.
> This commit adds a check whether the window is already visible.
> See https://wiki.tcl-lang.org/page/tkwait+visibility
>
> Signed-off-by: Tobias Pietzsch <pietzsch@mycroft.speedport.ip>
> ---
> gitk: check main window visibility before waiting for it to show
>
> If the main window is already visible when gitk waits for it to become
> visible, gitk hangs forever.
>
> This commit adds a check whether the window is already visible. See
> https://wiki.tcl-lang.org/page/tkwait+visibility
>
> The symptom of the for-ever waiting is that gitk shows just an empty
> window, like this: https://tinyurl.com/yxr5qlf6 It happens (to me) on
> macOS 11.1 with git-gui installed via homebrew. It doesn't happen on
> macOS 10.14.
Thanks, this also occurred on my macOS 10.14.6 just an hour ago after a
recent brew upgrade, and the patch makes gitk usable again.
Cheers, Beat
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-10 22:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-09 23:26 [PATCH] gitk: check main window visibility before waiting for it to show Tobias Pietzsch via GitGitGadget
2021-01-10 22:23 ` Beat Bolli
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).