diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-04 16:34:49 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-04 10:19:49 +0200 |
| commit | 98ed0a086fbaaef5124a48fd1114a1844ffbaabe (patch) | |
| tree | 9fbe118ca39ca03c84dec1dd6efef8d8c51d534e | |
| parent | 6b8844832dd6f83e9a933cb092f67b700b38abc5 (diff) | |
| download | qtwebengine-chromium-98ed0a086fbaaef5124a48fd1114a1844ffbaabe.tar.gz | |
Fix Chromium built with X11 running without
Handles cases where gfx::GetXDisplay() returns null at least for Qt.
Task-number: QTBUG-55384
Change-Id: Ie57c57d7189c279cb5c702325b450f9fb964ac60
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/ui/base/x/x11_util.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/ui/base/x/x11_util.cc b/chromium/ui/base/x/x11_util.cc index e96116b2d94..f4c51122e5a 100644 --- a/chromium/ui/base/x/x11_util.cc +++ b/chromium/ui/base/x/x11_util.cc @@ -129,6 +129,9 @@ bool SupportsEWMH() { bool GetWindowManagerName(std::string* wm_name) { DCHECK(wm_name); + if (!x11::Connection::Get()->GetXlibDisplay()) + return false; + if (!SupportsEWMH()) return false; |