Resolve conflicts

This commit is contained in:
Jack251970 2025-09-21 13:06:14 +08:00
parent 3282b02eed
commit e168984129

View file

@ -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
}
}