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

Merge pull request #7226 from electron/power-monitor-error

Browse source 
Rethrow caught errors from process.binding
This commit is contained in:
Cheng Zhao 2016-09-19 15:25:18 +09:00 • committed by GitHub
commit ffe931bde7
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_power_monitor.cc
View file

@ -44,7 +44,7 @@ v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
if (!Browser::Get()->is_ready()) {
isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
isolate,
"Cannot initialize \"power-monitor\" module before app is ready")));
"Cannot require \"powerMonitor\" module before app is ready")));
return v8::Null(isolate);
}

2
atom/browser/api/atom_api_screen.cc
View file

@ -97,7 +97,7 @@ v8::Local<v8::Value> Screen::Create(v8::Isolate* isolate) {
if (!Browser::Get()->is_ready()) {
isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
isolate,
"Cannot initialize \"screen\" module before app is ready")));
"Cannot require \"screen\" module before app is ready")));
return v8::Null(isolate);
}