MainWindow, View::View: Fix two memory errors reported by valgrind

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 7fe09fb732e9789ca8be26a958a4057a50e5a0fe..d65537483c8f1a19bd91e6ccd93dee7014b80bfc 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -280,8 +280,9 @@ void MainWindow::remove_session(shared_ptr<Session> session)
                                // that Qt keeps a pointer to the view around
                                entry.second->setParent(0);
 
-                               // Remove this entry from the container
+                               // Remove this entry from the container and stop iterating.
                                view_docks_.erase(entry.first);
+                               break;
                        }
        }
 
@@ -336,25 +337,28 @@ void MainWindow::setup_ui()
        action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
        action_view_coloured_bg_->setObjectName(
                QString::fromUtf8("actionViewColouredBg"));
-       action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+       action_view_coloured_bg_->setText(tr("Use &Coloured Backgrounds"));
 
        action_about_->setObjectName(QString::fromUtf8("actionAbout"));
-       action_about_->setText(tr("&About..."));
+       action_about_->setToolTip(tr("&About..."));
 
        // Set up the tab area
        new_session_button_ = new QToolButton();
        new_session_button_->setIcon(QIcon::fromTheme("document-new",
                QIcon(":/icons/document-new.png")));
+       new_session_button_->setToolTip(tr("Create New Session"));
        new_session_button_->setAutoRaise(true);
 
        run_stop_button_ = new QToolButton();
        run_stop_button_->setAutoRaise(true);
        run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
        run_stop_button_->setShortcut(QKeySequence(Qt::Key_Space));
+       run_stop_button_->setToolTip(tr("Start/Stop Acquisition"));
 
        settings_button_ = new QToolButton();
        settings_button_->setIcon(QIcon::fromTheme("configure",
                QIcon(":/icons/configure.png")));
+       settings_button_->setToolTip(tr("Settings"));
        settings_button_->setAutoRaise(true);
 
        QFrame *separator1 = new QFrame();