From 341ac26576e56a160e6d2768c71134835228153b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 19 May 2025 09:43:48 +0800
Subject: [PATCH 1/3] version: Release 2025.18

Signed-off-by: leo <longshuang@msn.cn>
---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 52dc0d52..60bea9b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.17
\ No newline at end of file
+2025.18
\ No newline at end of file

From aaf53ac69413d0ddde33f3a3d10a36e7b2962cf9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 19 May 2025 10:08:37 +0800
Subject: [PATCH 2/3] enhance: try to cancel switcher first then other popup

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Launcher.axaml.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index be4cdf5b..5759c87e 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -264,8 +264,11 @@ namespace SourceGit.Views
             }
             else if (e.Key == Key.Escape)
             {
-                vm.ActivePage.CancelPopup();
-                vm.CancelSwitcher();
+                if (vm.Switcher != null)
+                    vm.CancelSwitcher();
+                else
+                    vm.ActivePage.CancelPopup();
+
                 e.Handled = true;
                 return;
             }

From 57ee1f7dbd9f55aecb1111bd67ef08d9434de927 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 19 May 2025 10:55:25 +0800
Subject: [PATCH 3/3] fix: wrong hotkey tip for open `Preferences` window

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Launcher.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index bd115fef..88743c94 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -35,7 +35,7 @@
       <Button Grid.Column="0" Classes="icon_button" VerticalAlignment="Bottom" Margin="6,0,2,3" IsVisible="{OnPlatform True, macOS=False}">
         <Button.Flyout>
           <MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-8">
-            <MenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" InputGesture="Ctrl+Shift+P">
+            <MenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" InputGesture="Ctrl+,">
               <MenuItem.Icon>
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
               </MenuItem.Icon>