Don't lock up with Qt2.3.8

1 files changed, 2 insertions, 2 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 5d05ed5..3370264 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -991,13 +991,13 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
                                 active = activeWindow();
                         }
                 }
                 else {
                         // make sure our modal widget is ALWAYS on top
                         QWidget *topm = activeModalWidget();
-                        if ( topm ) {
+                        if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) {
                                 topm->raise();
                         }
                 }
                 if ( fe->simpleData.get_focus && inputMethodDict ) {
                         InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
                         if ( m == AlwaysOff )
@@ -1462,13 +1462,13 @@ bool QPEApplication::raiseAppropriateWindow()
         }
         d->lastraised = topsub;
         delete list;
     }
 
     // 3. Raise the active modal widget.
-    if ( topm && topm != top ) {
+    if ( topm ) {
         topm->show();
         topm->raise();
         // If we haven't already handled the fastAppShowing message
         if (!top && d->preloaded) {
 #ifndef QT_NO_COP
             QCopEnvelope e("QPE/System", "fastAppShowing(QString)");