diff --git a/src/Misc/App.cs b/src/Misc/App.cs index f4b3005..8b14883 100644 --- a/src/Misc/App.cs +++ b/src/Misc/App.cs @@ -272,5 +272,16 @@ namespace mpvnet if (File.Exists(dir + "mpvnet.exe") && !File.Exists(dir + "mpvnet.com")) File.Copy(Folder.Startup + "mpvnet.com", dir + "mpvnet.com"); } + + public static (string Title, string Path) GetTitleAndPath(string input) + { + if (input.Contains("|")) + { + var a = input.Split('|'); + return (a[1], a[0]); + } + + return (input, input); + } } } diff --git a/src/Misc/Commands.cs b/src/Misc/Commands.cs index 11155ff..eed3815 100644 --- a/src/Misc/Commands.cs +++ b/src/Misc/Commands.cs @@ -566,19 +566,12 @@ namespace mpvnet foreach (string path in App.Settings.RecentFiles) { - string file = path; - string title = path; - - if (title.Contains("|")) - { - title = title.Substring(title.IndexOf("|") + 1); - file = file.Substring(0, file.IndexOf("|")); - } + var file = App.GetTitleAndPath(path); CommandPaletteItem item = new CommandPaletteItem() { - Text = title.ShortPath(60), - Action = () => Core.LoadFiles(new[] { file }, true, Control.ModifierKeys.HasFlag(Keys.Control)) + Text = file.Title.ShortPath(60), + Action = () => Core.LoadFiles(new[] { file.Path }, true, Control.ModifierKeys.HasFlag(Keys.Control)) }; items.Add(item); diff --git a/src/Misc/MainForm.cs b/src/Misc/MainForm.cs index dcc5eaf..5bbc89e 100644 --- a/src/Misc/MainForm.cs +++ b/src/Misc/MainForm.cs @@ -322,20 +322,12 @@ namespace mpvnet foreach (string path in App.Settings.RecentFiles) { - string file = path; - string title = path; - - if (title.Contains("|")) - { - title = title.Substring(title.IndexOf("|") + 1); - file = file.Substring(0, file.IndexOf("|")); - } - - var mi = MenuHelp.Add(recentMenuItem.Items, title.ShortPath(100)); + var file = App.GetTitleAndPath(path); + var mi = MenuHelp.Add(recentMenuItem.Items, file.Title.ShortPath(100)); if (mi != null) mi.Click += (sender, args) => - Core.LoadFiles(new[] { file }, true, ModifierKeys.HasFlag(Keys.Control)); + Core.LoadFiles(new[] { file.Path }, true, ModifierKeys.HasFlag(Keys.Control)); } recentMenuItem.Items.Add(new WpfControls.Separator());