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

FIXME: dbus ObjectProxy methods should only be invoked on IO allowed sequence

Browse source
This commit is contained in:
deepak1556 2017-12-16 14:55:15 +05:30 • committed by Cheng Zhao
parent a1592446da
commit e072213923
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/ui/x/x_window_utils.cc
View file

@ -8,6 +8,7 @@
#include "base/environment.h" #include "base/environment.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/threading/thread_restrictions.h"
#include "dbus/bus.h" #include "dbus/bus.h"
#include "dbus/message.h" #include "dbus/message.h"
#include "dbus/object_proxy.h" #include "dbus/object_proxy.h"
@ -51,6 +52,7 @@ void SetWindowType(::Window xwindow, const std::string& type) {
} }
bool ShouldUseGlobalMenuBar() { bool ShouldUseGlobalMenuBar() {
base::ThreadRestrictions::ScopedAllowIO allow_io;
std::unique_ptr<base::Environment> env(base::Environment::Create()); std::unique_ptr<base::Environment> env(base::Environment::Create());
if (env->HasVar("ELECTRON_FORCE_WINDOW_MENU_BAR")) if (env->HasVar("ELECTRON_FORCE_WINDOW_MENU_BAR"))
return false; return false;