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
@@ -965,65 +965,65 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
 					                ke-> simpleData.is_auto_repeat, 1 );
 
 					QObject *which = QWidget::keyboardGrabber ( );
 					if ( !which )
 						which = QApplication::focusWidget ( );
 					if ( !which )
 						which = QApplication::activeWindow ( );
 					if ( !which )
 						which = qApp;
 
 					QApplication::sendEvent ( which, &qke );
 				}
 				else { // we didn't grab the keyboard, so send the event to the launcher
 					QCopEnvelope e ( "QPE/Launcher", "deviceButton(int,int,int)" );
 					e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
 				}
 			}
 			return true;
 		}
 	}
 	if ( e->type == QWSEvent::Focus ) {
 		QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
 		if ( !fe->simpleData.get_focus ) {
 			QWidget * active = activeWindow();
 			while ( active && active->isPopup() ) {
 				active->close();
 				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 )
 				Global::hideInputMethod();
 			if ( m == AlwaysOn )
 				Global::showInputMethod();
 		}
 	}
 
 
 	return QApplication::qwsEventFilter( e );
 }
 #endif
 
 /*!
   Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
 	ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 	// Need to delete QCopChannels early, since the display will
 	// be gone by the time we get to ~QObject().
 	delete sysChannel;
 	delete pidChannel;
 #endif
 
 	delete d;
 }
@@ -1436,65 +1436,65 @@ bool QPEApplication::raiseAppropriateWindow()
     //     are raised before and after this loop).  Order from most
     //     recently raised as deepest to least recently as top, so
     //     that repeated calls cycle through widgets.
     QWidgetList *list = topLevelWidgets();
     if ( list ) {
 	bool foundlast = FALSE;
 	QWidget* topsub = 0;
 	if ( d->lastraised ) {
 	    for (QWidget* w = list->first(); w; w = list->next()) {
 		if ( !w->parentWidget() && w != topm && w->isVisible() && !w->isDesktop() ) {
 		    if ( w == d->lastraised )
 			foundlast = TRUE;
 		    if ( foundlast ) {
 			w->raise();
 			topsub = w;
 		    }
 		}
 	    }
 	}
 	for (QWidget* w = list->first(); w; w = list->next()) {
 	    if ( !w->parentWidget() && w != topm && w->isVisible() && !w->isDesktop() ) {
 		if ( w == d->lastraised )
 		    break;
 		w->raise();
 		topsub = w;
 	    }
 	}
 	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)");
 	    e << d->appName;
 #endif
 	}
 	r = FALSE;
     }
 
     return r;
 }
 
 
 void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 {
 #ifdef Q_WS_QWS
 
 	if ( msg == "quit()" ) {
 		tryQuit();
 	}
 	else if ( msg == "quitIfInvisible()" ) {
 		if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
 			quit();
 	}
 	else if ( msg == "close()" ) {
 		hideOrQuit();
 	}
 	else if ( msg == "disablePreload()" ) {
 		d->preloaded = FALSE;