From bdf86088393d1208b9997e16634d13783452761b Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Sun, 8 Dec 2019 08:45:27 +0000
Subject: [PATCH] LCL-GTK3: Improve handling of & accelerator on button
 captions. Issue #36255, patch from Alexey Tor.

git-svn-id: trunk@62353 -
---
 lcl/interfaces/gtk3/gtk3objects.pas | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lcl/interfaces/gtk3/gtk3objects.pas b/lcl/interfaces/gtk3/gtk3objects.pas
index ff9fb8440b..bbfd488cc7 100644
--- a/lcl/interfaces/gtk3/gtk3objects.pas
+++ b/lcl/interfaces/gtk3/gtk3objects.pas
@@ -1937,7 +1937,8 @@ end;
 
 function ReplaceAmpersandsWithUnderscores(const S: string): string; inline;
 begin
-  Result := StringReplace(S, '&', '_', [rfReplaceAll]);
+  Result := StringReplace(S, '_', '__', [rfReplaceAll]);
+  Result := StringReplace(Result, '&', '_', [rfReplaceAll]);
 end;
 
 {-------------------------------------------------------------------------------