diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
commit | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch) | |
tree | 231f5c31f279d3e798702fe61e9b6bcef52b089b /src/widgets/qmenubar.cpp | |
parent | 6d0157ea558089bb957f35263424a405e42a6931 (diff) | |
parent | fe7969ef886d7287fa959929ddd33fbad8407884 (diff) | |
download | tqt3-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.cpp | 4 |
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; |