Skip to content

Fix openutau crash when dragging an invalid zip file into openutau window #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stakira merged 1 commit into from
May 10, 2024
Merged

Fix openutau crash when dragging an invalid zip file into openutau window #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions OpenUtau/Strings/Strings.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<system:String x:Key="errors.failed.importaudio">Failed to import audio</system:String>
<system:String x:Key="errors.failed.importfiles">Failed to import files</system:String>
<system:String x:Key="errors.failed.importmidi">Failed to import midi</system:String>
<system:String x:Key="errors.failed.installsinger">Failed to install singer</system:String>
<system:String x:Key="errors.failed.load">Failed to load</system:String>
<system:String x:Key="errors.failed.loadprefs">Failed to load prefs. Initialize it.</system:String>
<system:String x:Key="errors.failed.openfile">Failed to open</system:String>
Expand Down
21 changes: 13 additions & 8 deletions OpenUtau/Views/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,14 +852,19 @@ async void OnDrop(object? sender, DragEventArgs args) {
_ = await MessageBox.ShowError(this, new MessageCustomizableException("Failed to import midi", "<translate:errors.failed.importmidi>", e));
}
} else if (ext == ".zip" || ext == ".rar" || ext == ".uar") {
var setup = new SingerSetupDialog() {
DataContext = new SingerSetupViewModel() {
ArchiveFilePath = file,
},
};
_ = setup.ShowDialog(this);
if (setup.Position.Y < 0) {
setup.Position = setup.Position.WithY(0);
try{
var setup = new SingerSetupDialog() {
DataContext = new SingerSetupViewModel() {
ArchiveFilePath = file,
},
};
_ = setup.ShowDialog(this);
if (setup.Position.Y < 0) {
setup.Position = setup.Position.WithY(0);
}
} catch (Exception e) {
Log.Error(e, $"Failed to install singer {file}");
_ = await MessageBox.ShowError(this, new MessageCustomizableException("Failed to install singer", "<translate:errors.failed.installsinger>", e));
}
} else if (ext == Core.Vogen.VogenSingerInstaller.FileExt) {
Core.Vogen.VogenSingerInstaller.Install(file);
Expand Down