Merge from V6_main 13/12/2012

[modules/gui.git] / src / Qtx / QtxPopupMgr.cxx

diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx
index 2710a09337c45da9f17b50b254e573e65b32507b..1c9055c9b3187be526a407e1414761bdd1b1a677 100644 (file)
--- a/src/Qtx/QtxPopupMgr.cxx
+++ b/src/Qtx/QtxPopupMgr.cxx
@@ -374,7 +374,7 @@ int QtxPopupMgr::insertAction( QAction* a, const int pId, const QString& rule, c
 */
 bool QtxPopupMgr::hasRule( QAction* a, const RuleType t ) const
 {
-  return a ? expression( a, t, false ) : false;
+  return a ? expression( a, t, false )!=0 : false;
 }
 
 /*!