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

At Browser ctor time, DIR_USER_DATA is unset, wait

Browse source
This commit is contained in:
Paul Betts 2015-10-19 17:37:26 -07:00
parent b02f89e63b
commit 50fab0733b
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
atom/browser/browser.cc
View file

@ -21,16 +21,6 @@ Browser::Browser()
is_ready_(false), is_ready_(false),
is_shutdown_(false), is_shutdown_(false),
process_notify_callback_(NULL) { process_notify_callback_(NULL) {
base::FilePath userDir;
PathService::Get(brightray::DIR_USER_DATA, &userDir);
auto no_refcount_this = base::Unretained(this);
process_singleton_.reset(new AtomProcessSingleton(
userDir,
base::Bind(&Browser::OnProcessSingletonNotification, no_refcount_this)));
process_notify_result_ = process_singleton_->NotifyOtherProcessOrCreate();
WindowList::AddObserver(this); WindowList::AddObserver(this);
} }
@ -122,6 +112,17 @@ void Browser::Activate(bool has_visible_windows) {
} }
void Browser::WillFinishLaunching() { void Browser::WillFinishLaunching() {
base::FilePath userDir;
PathService::Get(brightray::DIR_USER_DATA, &userDir);
auto no_refcount_this = base::Unretained(this);
process_singleton_.reset(new AtomProcessSingleton(
userDir,
base::Bind(&Browser::OnProcessSingletonNotification, no_refcount_this)));
LOG(ERROR) << "Setting up Process Singleton: " << userDir.value();
process_notify_result_ = process_singleton_->NotifyOtherProcessOrCreate();
FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWillFinishLaunching()); FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWillFinishLaunching());
} }