github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: recursive printing crash (#21905)

Browse Source
This commit is contained in:
Shelley Vohr
2020-01-27 21:18:02 +00:00
committed by GitHub
parent 26dbd2218e
commit bf64b34475
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/chromium/printing.patch
View File

@@ -201,7 +201,7 @@ index 3d026cd11aa2c0b009812317995cd4e02161251e..2778bfd64270a2e93153f39e849316ed
printing_succeeded_ = false;
return true;
}
@@ -614,14 +627,24 @@ void PrintViewManagerBase::ReleasePrintJob() {
@@ -614,14 +627,22 @@ void PrintViewManagerBase::ReleasePrintJob() {
content::RenderFrameHost* rfh = printing_rfh_;
printing_rfh_ = nullptr;
@@ -211,8 +211,6 @@ index 3d026cd11aa2c0b009812317995cd4e02161251e..2778bfd64270a2e93153f39e849316ed
+ cb_str = printing_cancelled_ ? "cancelled" : "failed";
+ std::move(callback_).Run(printing_succeeded_, cb_str);
+ }
+
+ TerminatePrintJob(true);
+
if (!print_job_)
return;