SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Be smarter about old paths (fixes #455)

Browse Source
This commit is contained in:
Matt Nadareski
2023-02-23 12:31:27 -05:00
parent 49800cf0ed
commit 975eb97e27
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MPF/ViewModels/MainViewModel.cs
View File

@@ -977,23 +977,30 @@ namespace MPF.UI.ViewModels
string directory = App.Options.DefaultOutputPath;
string filename = $"{label}{extension ?? ".bin"}";
if (directory.EndsWith(label))
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, filename);
else
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
// If the path ends with the label already
if (directory.EndsWith(label, StringComparison.OrdinalIgnoreCase))
directory = Path.GetDirectoryName(directory);
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
}
// Set the output filename, if we changed drives
else if (driveChanged)
{
string label = drive?.FormattedVolumeLabel ?? systemType.LongName();
string oldFilename = Path.GetFileNameWithoutExtension(App.Instance.OutputPathTextBox.Text);
string directory = Path.GetDirectoryName(App.Instance.OutputPathTextBox.Text);
string filename = $"{label}{extension ?? ".bin"}";
if (directory.EndsWith(label))
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, filename);
else
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
// If the previous path included the label
if (directory.EndsWith(oldFilename, StringComparison.OrdinalIgnoreCase))
directory = Path.GetDirectoryName(directory);
// If the path ends with the label already
if (directory.EndsWith(label, StringComparison.OrdinalIgnoreCase))
directory = Path.GetDirectoryName(directory);
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
}
// Ensure the UI gets updated