Skip to content

Commit 5fb181a

Browse files
committed
Fixing save file dialog on Linux (no SuggestedStartLocation currently possible)
1 parent 3bbb95a commit 5fb181a

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

MergeSynced/MergeSynced.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<PublishSingleFile>true</PublishSingleFile>
99
<ApplicationManifest>app.manifest</ApplicationManifest>
1010
<ApplicationIcon>Assets\MergeSyncedLogoSimple.ico</ApplicationIcon>
11-
<AssemblyVersion>2.1.0</AssemblyVersion>
12-
<FileVersion>2.1.0</FileVersion>
13-
<CFBundleVersion>2.1.0</CFBundleVersion>
14-
<CFBundleShortVersionString>2.1.0</CFBundleShortVersionString>
11+
<AssemblyVersion>2.1.1</AssemblyVersion>
12+
<FileVersion>2.1.1</FileVersion>
13+
<CFBundleVersion>2.1.1</CFBundleVersion>
14+
<CFBundleShortVersionString>2.1.1</CFBundleShortVersionString>
1515
<CFBundleName>MergeSynced</CFBundleName>
1616
<CFBundleDisplayName>MergeSynced</CFBundleDisplayName>
1717
<CFBundleExecutable>MergeSynced</CFBundleExecutable>

MergeSynced/Views/MainWindow.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
</Grid>
233233

234234
<!-- Calculation results for audio sync -->
235-
<Grid Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2" ColumnDefinitions="140,200,*,54,50,60">
235+
<Grid Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2" ColumnDefinitions="150,200,*,54,50,60">
236236

237237
<StackPanel Grid.Column="0" VerticalAlignment="Center" Spacing="0">
238238
<Label Content="Calculated delay:" FontSize="14" Height="18" VerticalAlignment="Center" VerticalContentAlignment="Center" Padding="0" Margin="5 0 0 0"/>

MergeSynced/Views/MainWindow.axaml.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,11 @@ private async void Probe_OnClick(object sender, RoutedEventArgs e)
309309
SelectTrackA.IsEnabled = true;
310310

311311
_ep.CallFfprobe(FilePathB.Text, _workingDir);
312+
if (_ep.FfprobeProcess == null!)
313+
{
314+
SwitchButtonState(ProbeButton, false, "Error starting ffprobe", true);
315+
return;
316+
}
312317
await _ep.FfprobeProcess.WaitForExitAsync();
313318

314319
MainViewModel.ProgressPercent = 75;
@@ -939,7 +944,7 @@ private async void SelectOutputButton_OnClick(object sender, RoutedEventArgs e)
939944
if (folderLink is not null)
940945
{
941946
IStorageFolder? folder = await StorageProvider.TryGetFolderFromPathAsync(folderLink);
942-
if (folder != null) filePickerOptions.SuggestedStartLocation = folder;
947+
if (folder != null && !OperatingSystem.IsLinux()) filePickerOptions.SuggestedStartLocation = folder;
943948
}
944949

945950
IStorageFile? dialog = await StorageProvider.SaveFilePickerAsync(filePickerOptions);

0 commit comments

Comments
 (0)