author | zecke <zecke> | 2004-04-05 13:11:21 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-04-05 13:11:21 (UTC) |
commit | 3c2e23bacf25fc73d51bfa98a3b2ea9c0890d540 (patch) (unidiff) | |
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 | |||
@@ -994,7 +994,7 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) | |||
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 | } |
@@ -1465,7 +1465,7 @@ bool QPEApplication::raiseAppropriateWindow() | |||
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 |