This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch geckoview-99.0.1-11.0-1 in repository tor-browser. commit d50f6cf17ff5efed2c3f4c994283a5a5309bee75 Author: stransky <stransky@redhat.com> AuthorDate: Tue Feb 1 19:12:32 2022 +0000 Bug 1747475 [Linux] Don't assert/crash if we're missing mGdkWindow. r=emilio, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D137554 --- widget/gtk/nsWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp index 84566449ab51b..59e01f0feaaed 100644 --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -5237,7 +5237,8 @@ void nsWindow::DisableRenderingToWindow() { } Window nsWindow::GetX11Window() { - return GdkIsX11Display() ? gdk_x11_window_get_xid(mGdkWindow) : X11None; + return GdkIsX11Display() && mGdkWindow ? gdk_x11_window_get_xid(mGdkWindow) + : X11None; } void nsWindow::EnsureGdkWindow() { @@ -5246,7 +5247,6 @@ void nsWindow::EnsureGdkWindow() { : mShell); g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", this); } - MOZ_DIAGNOSTIC_ASSERT(mGdkWindow, "We're missing GdkWindow!"); } bool nsWindow::GetShapedState() { -- To stop receiving notification emails like this one, please contact the administrator of this repository.