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

Fix assertion when get X11 error in new thread

Browse source
This commit is contained in:
Cheng Zhao 2018-01-31 16:37:32 +09:00
parent 39e0433570
commit b25175a19a
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/browser_main_parts.cc
View file

@ -105,7 +105,7 @@ void OverrideLinuxAppDataPath() {
} }
int BrowserX11ErrorHandler(Display* d, XErrorEvent* error) { int BrowserX11ErrorHandler(Display* d, XErrorEvent* error) {
if (!g_in_x11_io_error_handler) { if (!g_in_x11_io_error_handler && base::ThreadTaskRunnerHandle::IsSet()) {
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&ui::LogErrorEventDescription, d, *error)); FROM_HERE, base::Bind(&ui::LogErrorEventDescription, d, *error));
} }

1
common.gypi
View file

@ -184,7 +184,6 @@
}, { }, {
'libraries': [ 'libraries': [
'<@(libchromiumcontent_v8_libraries)', '<@(libchromiumcontent_v8_libraries)',
'<(libchromiumcontent_dir)/libc++.so',
], ],
}], }],
], ],