| Summary: | kdiff3 empty window on startup when used as git mergetool | ||
|---|---|---|---|
| Product: | [Applications] kdiff3 | Reporter: | Bruno Pitrus <brunopitrus> |
| Component: | application | Assignee: | michael <reeves.87> |
| Status: | RESOLVED DUPLICATE | ||
| Severity: | normal | CC: | jonaskarlsson, loic.yhuel, pemensik |
| Priority: | NOR | ||
| Version First Reported In: | 1.12.3 | ||
| Target Milestone: | --- | ||
| Platform: | openSUSE | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed In: | ||
| Sentry Crash Report: | |||
| Bug Depends on: | 499772 | ||
| Bug Blocks: | |||
|
Description
Bruno Pitrus
2025-07-15 10:44:09 UTC
I have bisected and the commit which introduces this bug is https://github.com/KDE/kdiff3/commit/1ae607daa4c2153bbf88295fae153aa08f3bd5b Author: Michael Reeves <reeves.87@gmail.com> Date: Fri May 9 11:54:11 2025 -0400 Short curcuit DiffTextWindow::getMaxTextWidth for early init calls src/difftextwindow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Update: I have seen same symptoms on a different test case. This time they start appearing with commit https://github.com/KDE/kdiff3/commit/9481fd0f36aebca42791c2704eaf42a893dd37e7 From: Michael Reeves <reeves.87@gmail.com> Date: Tue, 19 Nov 2024 09:18:21 -0500 Subject: [PATCH] Remove foot gun and reimpliment word warp reset. This attempts impletement the intent of the removed code without using the error prone ProgressProxy::cancel mechinism. --- src/pdiff.cpp | 9 +++++++++ src/progress.cpp | 2 ++ src/progress.h | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) Is this a duplicate of 499772? (In reply to jonaskarlsson from comment #3) > Is this a duplicate of 499772? Yes, it seems to be the same random issue. Note that since the two commits cited here seem to be around word wrap, and I had a diff which seems to reproduced the issue (10/10 failures), I tried enabling Diffview->Word Wrap Diff Window, and suddenly it was fine. But then I disabled the option, and it worked too, so this is probably still related to timings. *** This bug has been marked as a duplicate of bug 499772 *** |