-rw-r--r-- | library/qpeapplication.cpp | 4 |
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 | |||
@@ -993,9 +993,9 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) | |||
993 | } | 993 | } |
994 | else { | 994 | else { |
995 | // make sure our modal widget is ALWAYS on top | 995 | // make sure our modal widget is ALWAYS on top |
996 | QWidget *topm = activeModalWidget(); | 996 | QWidget *topm = activeModalWidget(); |
997 | if ( topm ) { | 997 | if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) { |
998 | topm->raise(); | 998 | topm->raise(); |
999 | } | 999 | } |
1000 | } | 1000 | } |
1001 | if ( fe->simpleData.get_focus && inputMethodDict ) { | 1001 | if ( fe->simpleData.get_focus && inputMethodDict ) { |
@@ -1464,9 +1464,9 @@ bool QPEApplication::raiseAppropriateWindow() | |||
1464 | delete list; | 1464 | delete list; |
1465 | } | 1465 | } |
1466 | 1466 | ||
1467 | // 3. Raise the active modal widget. | 1467 | // 3. Raise the active modal widget. |
1468 | if ( topm && topm != top ) { | 1468 | if ( topm ) { |
1469 | topm->show(); | 1469 | topm->show(); |
1470 | topm->raise(); | 1470 | topm->raise(); |
1471 | // If we haven't already handled the fastAppShowing message | 1471 | // If we haven't already handled the fastAppShowing message |
1472 | if (!top && d->preloaded) { | 1472 | if (!top && d->preloaded) { |