From 43c53ff93b60c5744ed39f8895e0af8b10b2d474 Mon Sep 17 00:00:00 2001 From: Xpl0itU <24777100+Xpl0itU@users.noreply.github.com> Date: Thu, 20 Jul 2023 15:34:43 +0200 Subject: [PATCH] Fix decrypt contents menu --- cmd/WiiUDownloader/mainwindow.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/cmd/WiiUDownloader/mainwindow.go b/cmd/WiiUDownloader/mainwindow.go index 8e351d2..fa42669 100644 --- a/cmd/WiiUDownloader/mainwindow.go +++ b/cmd/WiiUDownloader/mainwindow.go @@ -180,8 +180,19 @@ func (mw *MainWindow) ShowAll() { if err != nil { return } + dialog, err := gtk.FileChooserNativeDialogNew("Select the path to decrypt", mw.window, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, "Select", "Cancel") + if err != nil { + log.Fatal("Unable to create dialog:", err) + } + res := dialog.Run() + if res != int(gtk.RESPONSE_ACCEPT) { + mw.progressWindow.Window.Close() + return + } + + selectedPath := dialog.FileChooser.GetFilename() mw.progressWindow.Window.ShowAll() - go mw.onDecryptContentsMenuItemClicked() + go mw.onDecryptContentsMenuItemClicked(selectedPath) }) toolsSubMenu.Append(decryptContentsMenuItem) @@ -378,19 +389,7 @@ func (mw *MainWindow) onCategoryToggled(button *gtk.ToggleButton) { button.Activate() } -func (mw *MainWindow) onDecryptContentsMenuItemClicked() { - dialog, err := gtk.FileChooserNativeDialogNew("Select the path to decrypt", mw.window, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, "Select", "Cancel") - if err != nil { - log.Fatal("Unable to create dialog:", err) - } - res := dialog.Run() - if res != int(gtk.RESPONSE_ACCEPT) { - mw.progressWindow.Window.Close() - return - } - - selectedPath := dialog.FileChooser.GetFilename() - +func (mw *MainWindow) onDecryptContentsMenuItemClicked(selectedPath string) { wiiudownloader.DecryptContents(selectedPath, &mw.progressWindow, false) mw.progressWindow.Window.Close()