From 3c6a85e0f802fba6b3f6bc1a4c86e1711a4989ae Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Wed, 13 Dec 2006 00:42:03 +0000 Subject: [PATCH] be resistent to not creating the browser just on the off chance that MussaWindow.browser isn't created test the pointer before trying to call it. (AKA some left over debugging code) --- qui/MussaWindow.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/qui/MussaWindow.cpp b/qui/MussaWindow.cpp index 20c4a03..883703f 100644 --- a/qui/MussaWindow.cpp +++ b/qui/MussaWindow.cpp @@ -208,9 +208,11 @@ void MussaWindow::setupActions() //Save pixel map action saveBrowserPixmapAction = new QAction(tr("Save to image..."), this); - connect(saveBrowserPixmapAction, (SIGNAL(triggered())), - browser, SLOT(promptSaveBrowserPixmap())); - saveBrowserPixmapAction->setIcon(QIcon(":/icons/image2.png")); + if (browser) { + connect(saveBrowserPixmapAction, (SIGNAL(triggered())), + browser, SLOT(promptSaveBrowserPixmap())); + saveBrowserPixmapAction->setIcon(QIcon(":/icons/image2.png")); + } viewMussaAlignmentAction = new QAction(tr("View sequence alignment"), this); connect(viewMussaAlignmentAction, SIGNAL(triggered()), @@ -257,10 +259,10 @@ void MussaWindow::setupMainMenu() newMenu = menuBar()->addMenu(tr("&Edit")); newMenu->addAction(editMotifsAction); - newMenu->addAction(browser->getCopySelectedSequenceAsStringAction()); - newMenu->addAction(browser->getCopySelectedSequenceAsFastaAction()); + if (browser) newMenu->addAction(browser->getCopySelectedSequenceAsStringAction()); + if (browser) newMenu->addAction(browser->getCopySelectedSequenceAsFastaAction()); newMenu->addAction(createSubAnalysisAction); - newMenu->addAction(browser->getEditSequencePropertiesAction()); + if (browser) newMenu->addAction(browser->getEditSequencePropertiesAction()); newMenu = menuBar()->addMenu(tr("&View")); newMenu->addAction(viewMussaAlignmentAction); @@ -273,10 +275,12 @@ void MussaWindow::setupMainMenu() newMenu->addAction(aboutAction); // add some extra features to the context menu - QMenu *popupMenu = browser->getPopupMenu(); - if (popupMenu) { - popupMenu->addAction(viewMussaAlignmentAction); - popupMenu->addAction(createSubAnalysisAction); + if (browser) { + QMenu *popupMenu = browser->getPopupMenu(); + if (popupMenu) { + popupMenu->addAction(viewMussaAlignmentAction); + popupMenu->addAction(createSubAnalysisAction); + } } } -- 2.30.2