From 803d1c687a653679b7d7fe6ad461b9f451e47eb6 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:38:53 +0200 Subject: [PATCH] fix: param passed to `showSaveDialogSync` on Linux (#42676) fix: pass correct param to sync functions on Linux Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- shell/browser/ui/file_dialog_linux.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/shell/browser/ui/file_dialog_linux.cc b/shell/browser/ui/file_dialog_linux.cc index b24a869043a..3217e2d8c5e 100644 --- a/shell/browser/ui/file_dialog_linux.cc +++ b/shell/browser/ui/file_dialog_linux.cc @@ -207,9 +207,6 @@ class FileChooserDialog : public ui::SelectFileDialog::Listener { bool ShowOpenDialogSync(const DialogSettings& settings, std::vector* paths) { - v8::Isolate* isolate = electron::JavascriptEnvironment::GetIsolate(); - gin_helper::Promise promise(isolate); - base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed); auto cb = base::BindOnce( [](base::RepeatingClosure cb, std::vector* file_paths, @@ -221,7 +218,6 @@ bool ShowOpenDialogSync(const DialogSettings& settings, FileChooserDialog* dialog = new FileChooserDialog(); dialog->RunOpenDialog(std::move(cb), settings); - run_loop.Run(); return !paths->empty(); } @@ -234,8 +230,6 @@ void ShowOpenDialog(const DialogSettings& settings, bool ShowSaveDialogSync(const DialogSettings& settings, base::FilePath* path) { base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed); - v8::Isolate* isolate = electron::JavascriptEnvironment::GetIsolate(); - gin_helper::Promise promise(isolate); auto cb = base::BindOnce( [](base::RepeatingClosure cb, base::FilePath* file_path, gin_helper::Dictionary result) { @@ -245,7 +239,7 @@ bool ShowSaveDialogSync(const DialogSettings& settings, base::FilePath* path) { run_loop.QuitClosure(), path); FileChooserDialog* dialog = new FileChooserDialog(); - dialog->RunSaveDialog(std::move(promise), settings); + dialog->RunSaveDialog(std::move(cb), settings); run_loop.Run(); return !path->empty(); }