summaryrefslogtreecommitdiffstats
path: root/src/widgets/qmenubar.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-08-03 08:49:38 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-08-03 08:49:38 -0500
commit7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch)
tree231f5c31f279d3e798702fe61e9b6bcef52b089b /src/widgets/qmenubar.cpp
parent6d0157ea558089bb957f35263424a405e42a6931 (diff)
parentfe7969ef886d7287fa959929ddd33fbad8407884 (diff)
downloadtqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.tar.gz
tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/widgets/qmenubar.cpp')
-rw-r--r--src/widgets/qmenubar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index 02ee71b24..8ee3cad20 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -1240,8 +1240,8 @@ void TQMenuBar::mouseReleaseEvent( TQMouseEvent *e )
return;
mouseBtDn = FALSE; // mouse button up
int item = itemAtPos( e->pos() );
- if ( item >= 0 && !mitems->at(item)->isEnabledAndVisible() ||
- actItem >= 0 && !mitems->at(actItem)->isEnabledAndVisible() ) {
+ if ( ( item >= 0 && !mitems->at(item)->isEnabledAndVisible() ) ||
+ ( actItem >= 0 && !mitems->at(actItem)->isEnabledAndVisible() ) ) {
hidePopups();
setActiveItem( -1 );
return;