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: pass the exit code correctly in new PreMainMessageLoopRun

Browse Source 
Refs: 2622e91c44
This commit is contained in:
Samuel Attard
2021-04-14 16:25:48 -07:00
parent 898f8448f8
commit f8f388573c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/browser/electron_browser_main_parts.cc
View File

@@ -227,7 +227,7 @@ bool ElectronBrowserMainParts::SetExitCode(int code) {
}
int ElectronBrowserMainParts::GetExitCode() const {
return exit_code_ ? *exit_code_ : 0;
return exit_code_.value_or(content::RESULT_CODE_NORMAL_EXIT);
}
int ElectronBrowserMainParts::PreEarlyInitialization() {
@@ -240,7 +240,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() {
HandleSIGCHLD();
#endif
return content::RESULT_CODE_NORMAL_EXIT;
return GetExitCode();
}
void ElectronBrowserMainParts::PostEarlyInitialization() {
@@ -473,7 +473,7 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
// Notify observers that main thread message loop was initialized.
Browser::Get()->PreMainMessageLoopRun();
return content::RESULT_CODE_NORMAL_EXIT;
return GetExitCode();
}
void ElectronBrowserMainParts::WillRunMainMessageLoop(