From e168984129c657a0153b8826e74e61dbef7950e9 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Sun, 21 Sep 2025 13:06:14 +0800 Subject: [PATCH] Resolve conflicts --- Flow.Launcher.Infrastructure/Win32Helper.cs | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs index 279022524..6a0a4f9aa 100644 --- a/Flow.Launcher.Infrastructure/Win32Helper.cs +++ b/Flow.Launcher.Infrastructure/Win32Helper.cs @@ -908,6 +908,20 @@ namespace Flow.Launcher.Infrastructure #endregion + #region File / Folder Dialog + + public static string SelectFile() + { + var dlg = new OpenFileDialog(); + var result = dlg.ShowDialog(); + if (result == true) + return dlg.FileName; + + return string.Empty; + } + + #endregion + #region Administrator Mode public static bool IsAdministrator() @@ -1066,19 +1080,5 @@ cleanup: } #endregion - - #region File / Folder Dialog - - public static string SelectFile() - { - var dlg = new OpenFileDialog(); - var result = dlg.ShowDialog(); - if (result == true) - return dlg.FileName; - - return string.Empty; - } - - #endregion } }