| author | zecke <zecke> | 2004-04-05 13:11:21 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-04-05 13:11:21 (UTC) |
| commit | 3c2e23bacf25fc73d51bfa98a3b2ea9c0890d540 (patch) (side-by-side diff) | |
| tree | 7541a347abc4b028163ce9ed1b05d692c2941a56 /library | |
| parent | f1708be741dfb73ceaffb633b44093f2cb2b3d57 (diff) | |
| download | opie-3c2e23bacf25fc73d51bfa98a3b2ea9c0890d540.zip opie-3c2e23bacf25fc73d51bfa98a3b2ea9c0890d540.tar.gz opie-3c2e23bacf25fc73d51bfa98a3b2ea9c0890d540.tar.bz2 | |
Don't lock up with Qt2.3.8
| -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 @@ -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)"); |