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

If a user calls makeSingleInstance more than once, just ignore it

Browse source
This commit is contained in:
Paul Betts 2015-10-21 12:29:00 -07:00
parent 38d6ff79c8
commit a160891a27
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -271,15 +271,15 @@ v8::Local<v8::Value> App::DefaultSession(v8::Isolate* isolate) {
bool App::MakeSingleInstance(v8::Local<v8::Function> callback) {
auto browser = Browser::Get();
single_instance_callback_ = callback;
if (browser->InitializeSingleInstance()) {
single_instance_callback_ = callback;
browser->InitializeSingleInstance();
ProcessSingleton::NotificationCallback cb;
mate::Converter<ProcessSingleton::NotificationCallback>::FromV8(
isolate(), single_instance_callback_, &cb);
ProcessSingleton::NotificationCallback cb;
mate::Converter<ProcessSingleton::NotificationCallback>::FromV8(
isolate(), single_instance_callback_, &cb);
browser->SetSingleInstanceCallback(cb);
browser->SetSingleInstanceCallback(cb);
}
switch (browser->GetSingleInstanceResult()) {
case ProcessSingleton::NotifyResult::PROCESS_NONE:

7
atom/browser/browser.cc
View file

@ -165,7 +165,7 @@ bool Browser::HandleBeforeQuit() {
return !prevent_default;
}
void Browser::InitializeSingleInstance() {
bool Browser::InitializeSingleInstance() {
base::FilePath userDir;
PathService::Get(brightray::DIR_USER_DATA, &userDir);
@ -174,11 +174,12 @@ void Browser::InitializeSingleInstance() {
userDir,
base::Bind(&Browser::OnProcessSingletonNotification, no_refcount_this)));
process_notify_result_ = process_singleton_->NotifyOtherProcessOrCreate();
if (is_ready_) {
process_singleton_->Unlock();
}
process_notify_result_ = process_singleton_->NotifyOtherProcessOrCreate();
return true;
}
ProcessSingleton::NotifyResult Browser::GetSingleInstanceResult() {

2
atom/browser/browser.h
View file

@ -66,7 +66,7 @@ class Browser : public WindowListObserver {
// Clear the recent documents list.
void ClearRecentDocuments();
void InitializeSingleInstance();
bool InitializeSingleInstance();
ProcessSingleton::NotifyResult GetSingleInstanceResult();
void SetSingleInstanceCallback(
ProcessSingleton::NotificationCallback callback);