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

Since setting up process_singleton is now conditional, its cleanup / unlock must be too

Browse source
This commit is contained in:
Paul Betts 2015-10-20 17:27:28 -07:00
parent 15f00db1bf
commit e5094fff3e
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/browser.cc
View file

@ -117,7 +117,11 @@ void Browser::WillFinishLaunching() {
void Browser::DidFinishLaunching() { void Browser::DidFinishLaunching() {
is_ready_ = true; is_ready_ = true;
process_singleton_->Unlock();
if (process_notify_callback_set_) {
process_singleton_->Unlock();
}
FOR_EACH_OBSERVER(BrowserObserver, observers_, OnFinishLaunching()); FOR_EACH_OBSERVER(BrowserObserver, observers_, OnFinishLaunching());
} }
@ -144,7 +148,10 @@ void Browser::NotifyAndShutdown() {
return; return;
} }
process_singleton_->Cleanup(); if (process_notify_callback_set_) {
process_singleton_->Cleanup();
}
Shutdown(); Shutdown();
} }
@ -167,6 +174,10 @@ void Browser::InitializeSingleInstance() {
base::Bind(&Browser::OnProcessSingletonNotification, no_refcount_this))); base::Bind(&Browser::OnProcessSingletonNotification, no_refcount_this)));
process_notify_result_ = process_singleton_->NotifyOtherProcessOrCreate(); process_notify_result_ = process_singleton_->NotifyOtherProcessOrCreate();
if (is_ready_) {
process_singleton_->Unlock();
}
} }
ProcessSingleton::NotifyResult Browser::GetSingleInstanceResult() { ProcessSingleton::NotifyResult Browser::GetSingleInstanceResult() {