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

Merge pull request #1297 from deepak1556/api_tray_patch

Browse source 
throw when trying to create tray before app is ready
This commit is contained in:
Cheng Zhao 2015-03-26 11:28:54 +08:00
commit 1a6677bdc3
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_tray.cc
View file

@ -7,6 +7,7 @@
#include <string>
#include "atom/browser/api/atom_api_menu.h"
#include "atom/browser/browser.h"
#include "atom/browser/ui/tray_icon.h"
#include "atom/common/native_mate_converters/image_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
@ -31,6 +32,10 @@ Tray::~Tray() {
// static
mate::Wrappable* Tray::New(const gfx::Image& image) {
if (!Browser::Get()->is_ready()) {
node::ThrowError("Cannot create Tray before app is ready");
return nullptr;
}
return new Tray(image);
}