From 9c19e3c6fdde73d64c8f499bcef030bb4ea020af Mon Sep 17 00:00:00 2001
From: Mirek Fidler <mirek.fidler@gmail.com>
Date: Fri, 31 Jan 2025 14:01:19 +0100
Subject: [PATCH] RichEdit: hyperlink handling fixes

---
 uppsrc/RichEdit/Kbd.cpp    | 2 +-
 uppsrc/RichEdit/Modify.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/uppsrc/RichEdit/Kbd.cpp b/uppsrc/RichEdit/Kbd.cpp
index 2837c494d..f177b4002 100644
--- a/uppsrc/RichEdit/Kbd.cpp
+++ b/uppsrc/RichEdit/Kbd.cpp
@@ -112,10 +112,10 @@ bool RichEdit::Key(dword key, int count)
 				return true;
 			if(RemoveBullet(false))
 				break;
-			formatinfo.link.Clear();
 			RichText::FormatInfo f = formatinfo;
 			InsertLine();
 			formatinfo = f;
+			formatinfo.link.Clear();
 			ShowFormat();
 			FinishNF();
 		}
diff --git a/uppsrc/RichEdit/Modify.cpp b/uppsrc/RichEdit/Modify.cpp
index 31f964ad3..b7f41aa17 100644
--- a/uppsrc/RichEdit/Modify.cpp
+++ b/uppsrc/RichEdit/Modify.cpp
@@ -430,6 +430,7 @@ void RichEdit::InsertLine()
 {
 	if(IsReadOnly())
 		return;
+	formatinfo.link.Clear();
 	RichText::FormatInfo b = formatinfo;
 	RichText h;
 	h.SetStyles(text.GetStyles());
@@ -459,7 +460,7 @@ void RichEdit::InsertLine()
 			return;
 		}
 	}
-	ApplyFormat(0, RichText::NEWPAGE|RichText::LABEL|RichText::NEWHDRFTR);
+	ApplyFormat(RichText::LINK, RichText::NEWPAGE|RichText::LABEL|RichText::NEWHDRFTR);
 	objectpos = -1;
 }