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

Move OnBrowserReady call to PreMainMessageLoopRun to account for timing issues on macOS

Browse source
This commit is contained in:
Samuel Attard 2017-09-14 23:08:18 +10:00 • committed by Cheng Zhao
parent 28900a9b63
commit f928a399ae
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_app.cc
View file

@ -522,6 +522,7 @@ App::App(v8::Isolate* isolate) {
base::ProcessMetrics::CreateCurrentProcessMetrics()));
app_metrics_[pid] = std::move(process_metric);
Init(isolate);
App::self_ = this;
}
App::~App() {
@ -532,6 +533,10 @@ App::~App() {
content::BrowserChildProcessObserver::Remove(this);
}
App* App::Get() {
return App::self_;
}
void App::OnBeforeQuit(bool* prevent_default) {
*prevent_default = Emit("before-quit");
}
@ -577,7 +582,9 @@ void App::OnFinishLaunching(const base::DictionaryValue& launch_info) {
media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
#endif
Emit("ready", launch_info);
}
void App::PreMainMessageLoopRun() {
if (process_singleton_) {
process_singleton_->OnBrowserReady();
}