Avoid panics in QDesktopWidget on Symbian emulator.

There is usually only one screen on the emulator and it was incorrectly
assumed that ScreenDevice() would return null for a non-existing
screen. It panics instead so the entire call must be skipped.

Reviewed-by: Sami Merila

1 files changed, 8 insertions, 6 deletions

diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/kernel/qdesktopwidget_s60.cpp
index c3963f4..62a4d40 100644
--- a/src/gui/kernel/qdesktopwidget_s60.cpp
+++ b/src/gui/kernel/qdesktopwidget_s60.cpp
@@ -188,12 +188,14 @@ void QDesktopWidgetPrivate::cleanup()
 void QDesktopWidgetPrivate::init_sys()
 {
 #if defined(Q_SYMBIAN_SUPPORTS_MULTIPLE_SCREENS)
-    CWsScreenDevice *dev = S60->screenDevice(1);
-    if (dev) {
-        displayControl = static_cast<MDisplayControl *>(
-                    dev->GetInterface(MDisplayControl::ETypeId));
-        if (displayControl) {
-            displayControl->EnableDisplayChangeEvents(ETrue);
+    if (S60->screenCount() > 1) {
+        CWsScreenDevice *dev = S60->screenDevice(1);
+        if (dev) {
+            displayControl = static_cast<MDisplayControl *>(
+                        dev->GetInterface(MDisplayControl::ETypeId));
+            if (displayControl) {
+                displayControl->EnableDisplayChangeEvents(ETrue);
+            }
         }
     }
 #endif