mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: delete rfh after open/save dialog done (#30916)

Browse source
This commit is contained in:
Keeley Hammond 2021-09-13 06:25:13 -07:00 • committed by GitHub
parent 06b3b49214
commit b6a12a53e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/file_select_helper.cc
View file

@ -183,6 +183,7 @@ void FileSelectHelper::OnOpenDialogDone(gin_helper::Dictionary result) {
browser_context->prefs()->SetFilePath(prefs::kSelectFileLastDirectory, browser_context->prefs()->SetFilePath(prefs::kSelectFileLastDirectory,
paths[0].DirName()); paths[0].DirName());
} }
RunFileChooserEnd();
} }
} }
} }
@ -214,6 +215,7 @@ void FileSelectHelper::OnSaveDialogDone(gin_helper::Dictionary result) {
} }
// We should only call this if we have not cancelled the dialog. // We should only call this if we have not cancelled the dialog.
OnFilesSelected(std::move(file_info), base::FilePath()); OnFilesSelected(std::move(file_info), base::FilePath());
RunFileChooserEnd();
} }
} }
@ -224,10 +226,6 @@ void FileSelectHelper::OnFilesSelected(
listener_->FileSelected(std::move(file_info), base_dir, mode_); listener_->FileSelected(std::move(file_info), base_dir, mode_);
listener_.reset(); listener_.reset();
} }
render_frame_host_ = nullptr;
delete this;
} }
void FileSelectHelper::RenderWidgetHostDestroyed( void FileSelectHelper::RenderWidgetHostDestroyed(