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

Merge pull request #32 from brightray/appcache-hang

Browse source 
Fix a hang on quit when application cache is used
This commit is contained in:
Adam Roben 2013-10-23 09:17:39 -07:00
commit bd02203151
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/browser_main_parts.cc
View file

@ -23,6 +23,10 @@ void BrowserMainParts::PreMainMessageLoopRun() {
content::WebUIControllerFactory::RegisterFactory(web_ui_controller_factory_.get()); content::WebUIControllerFactory::RegisterFactory(web_ui_controller_factory_.get());
} }
void BrowserMainParts::PostMainMessageLoopRun() {
browser_context_.reset();
}
BrowserContext* BrowserMainParts::CreateBrowserContext() { BrowserContext* BrowserMainParts::CreateBrowserContext() {
return new BrowserContext; return new BrowserContext;
} }

1
brightray/browser/browser_main_parts.h
View file

@ -31,6 +31,7 @@ protected:
#endif #endif
virtual void PreMainMessageLoopRun() OVERRIDE; virtual void PreMainMessageLoopRun() OVERRIDE;
virtual void PostMainMessageLoopRun() OVERRIDE;
private: private:
scoped_ptr<BrowserContext> browser_context_; scoped_ptr<BrowserContext> browser_context_;