github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 15:28:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Run destruction callbacks before message loop gets destroyed

Browse Source
This commit is contained in:
Cheng Zhao
2015-09-09 19:27:08 +08:00
parent e5496d9ac0
commit 9d51da505e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
atom/browser/atom_browser_main_parts.cc
View File

@@ -39,8 +39,6 @@ AtomBrowserMainParts::AtomBrowserMainParts()
}
AtomBrowserMainParts::~AtomBrowserMainParts() {
for (const auto& callback : destruction_callbacks_)
callback.Run();
}
// static
@@ -118,4 +116,14 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
#endif
}
void AtomBrowserMainParts::PostMainMessageLoopRun() {
brightray::BrowserMainParts::PostMainMessageLoopRun();
// Make sure destruction callbacks are called before message loop is
// destroyed, otherwise some objects that need to be deleted on IO thread
// won't be freed.
for (const auto& callback : destruction_callbacks_)
callback.Run();
}
} // namespace atom

1
atom/browser/atom_browser_main_parts.h
View File

@@ -41,6 +41,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
// content::BrowserMainParts:
void PostEarlyInitialization() override;
void PreMainMessageLoopRun() override;
void PostMainMessageLoopRun() override;
#if defined(OS_MACOSX)
void PreMainMessageLoopStart() override;
void PostDestroyThreads() override;