[LyX/master] Fix a mistake

Koji Yokota <[email protected]> Sun, 14 Jun 2026 12:37:13 +0000
Newsgroups gmane.editors.lyx.cvs
Message-ID <[email protected]>
commit 7d402741424fa870a0999b5bb84aef4b774bd798
Author: Koji Yokota <[email protected]>
Date:   Sun Jun 14 21:36:40 2026 +0900

    Fix a mistake
---
 src/frontends/qt/GuiInputMethod.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/frontends/qt/GuiInputMethod.cpp b/src/frontends/qt/GuiInputMethod.cpp
index 7d073483c4..e9a28b84ba 100644
--- a/src/frontends/qt/GuiInputMethod.cpp
+++ b/src/frontends/qt/GuiInputMethod.cpp
@@ -684,10 +684,7 @@ pos_type GuiInputMethod::pickNextSegFromTurnout(pos_type next_seg_pos, size_type
 			// 2. shared elements ( [C, min(B, D)) )
 			size_type seg_len = min(D - C, B - C);
 			// note: *cf has changed here
-			if (cf != nullptr)
-				cf->merge(past_cf);
-			else
-				*cf = past_cf;
+			cf->merge(past_cf);
 			seg = {C, seg_len, *cf};
 			LYXERR(Debug::KEY,
 			       "Merged and registered: [" << C << ", " << C + seg_len
-- 
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs