Browse Source

Merge branch '236-ctkMenuComboBox-crash-if-no-menu-and-press-magnifying-glass'

MattClarkson 12 years ago
parent
commit
7900729088
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Libs/Widgets/ctkMenuComboBox.cpp

+ 1 - 1
Libs/Widgets/ctkMenuComboBox.cpp

@@ -126,7 +126,7 @@ void ctkMenuComboBoxPrivate::init()
 //  ------------------------------------------------------------------------
 QAction* ctkMenuComboBoxPrivate::actionByTitle(const QString& text, const QMenu* parentMenu)
 {
-  if (parentMenu->title() == text)
+  if (!parentMenu || parentMenu->title() == text)
     {
     return 0;
     }