From 0234f1d4863ab9a6dda9fd8320ede96626dbf5e8 Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Wed, 23 Feb 2011 09:39:00 -0800
Subject: [PATCH] Bug 636008 - [Maemo6] Fennec crashes on startup, with Xlib
 error. r=wolfiR a=npotb

--HG--
extra : rebase_source : 8055f0cd4e1c51f2a8372adaf96e4fce701cc960
---
 widget/src/qt/nsWindow.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index 1267a578d213..47cc9f0e4899 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -2606,8 +2606,10 @@ nsWindow::createQWidget(MozQWidget *parent, nsWidgetInitData *aInitData)
 #endif
 
 #ifdef MOZ_X11
-        XSetWindowBackgroundPixmap(QX11Info::display(),
-                                   newView->effectiveWinId(), None);
+        if (newView->effectiveWinId()) {
+            XSetWindowBackgroundPixmap(QX11Info::display(),
+                                       newView->effectiveWinId(), None);
+        }
 #endif
     }