From fef5dd49e68c8f07dbbe562a1f9940131ed04b8b Mon Sep 17 00:00:00 2001
From: Marco Biasini <marco.biasini@unibas.ch>
Date: Sat, 21 Jul 2012 09:46:46 +0200
Subject: [PATCH] avoid segfault in sequence viewer
The segfault was showing up when using the sequence viewer in an
application without a GostyApp instance.
---
modules/gui/src/sequence_viewer/sequence_viewer.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/gui/src/sequence_viewer/sequence_viewer.cc b/modules/gui/src/sequence_viewer/sequence_viewer.cc
index 024355c1b..a34e917b6 100644
--- a/modules/gui/src/sequence_viewer/sequence_viewer.cc
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.cc
@@ -96,6 +96,7 @@ SequenceViewer::SequenceViewer(bool stand_alone, bool observe_scene,
layout->setSpacing(0);
this->setLayout(layout);
+ toolbar_ = new QToolBar(this);
this->InitActions();
@@ -120,7 +121,6 @@ SequenceViewer::SequenceViewer(bool stand_alone, bool observe_scene,
void SequenceViewer::InitMenuBar()
{
- toolbar_ = new QToolBar(this);
toolbar_->setToolButtonStyle(Qt::ToolButtonIconOnly);
toolbar_->setIconSize(QSize(16,16));
toolbar_->addActions(action_list_);
@@ -164,7 +164,7 @@ void SequenceViewer::InitActions()
icon_path.cd("gui");
icon_path.cd("icons");
- QAction* find_action = new QAction(this);
+ QAction* find_action = new QAction(toolbar_);
find_action->setText("Find Dialog");
find_action->setShortcut(QKeySequence(tr("Ctrl+F")));
find_action->setCheckable(true);
@@ -173,8 +173,8 @@ void SequenceViewer::InitActions()
action_list_.append(find_action);
connect(find_action, SIGNAL(triggered(bool)), this, SLOT(FindInSequence()));
- display_mode_actions_ = new QActionGroup(this);
- QAction* menu_action = new QAction(this);
+ display_mode_actions_ = new QActionGroup(toolbar_);
+ QAction* menu_action = new QAction(toolbar_);
menu_action->setText("Menubar");
menu_action->setShortcut(QKeySequence(tr("Ctrl+M")));
menu_action->setToolTip("Display Options (Ctrl+M)");
--
GitLab