From 9142479585a6737112be79b5e7ca060490a16c35 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 19 Feb 2020 09:51:55 +0100 Subject: [PATCH] Fixed a segfault. --- src/lay/lay/layMainWindow.cc | 14 ++++---------- src/lay/lay/layMainWindow.h | 1 - 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lay/lay/layMainWindow.cc b/src/lay/lay/layMainWindow.cc index 6e62dc9ae..5054baa9e 100644 --- a/src/lay/lay/layMainWindow.cc +++ b/src/lay/lay/layMainWindow.cc @@ -1122,23 +1122,17 @@ MainWindow::config_finalize () } } - for (std::vector::iterator a = m_default_grid_actions.begin (); a != m_default_grid_actions.end (); ++a) { - delete *a; - } - m_default_grid_actions.clear (); - int i = 1; for (std::vector::const_iterator g = m_default_grids.begin (); g != m_default_grids.end (); ++g, ++i) { std::string name = "default_grid_" + tl::to_string (i); - m_default_grid_actions.push_back (new lay::ConfigureAction (tl::to_string (*g) + tl::to_string (QObject::tr (" um")), cfg_grid, tl::to_string (*g))); - - m_default_grid_actions.back ()->set_checkable (true); - m_default_grid_actions.back ()->set_checked (fabs (*g - m_grid_micron) < 1e-10); + lay::Action *ga = new lay::ConfigureAction (tl::to_string (*g) + tl::to_string (QObject::tr (" um")), cfg_grid, tl::to_string (*g)); + ga->set_checkable (true); + ga->set_checked (fabs (*g - m_grid_micron) < 1e-10); for (std::vector::const_iterator t = group.begin (); t != group.end (); ++t) { - menu ()->insert_item (*t + ".end", name, m_default_grid_actions.back ()); + menu ()->insert_item (*t + ".end", name, ga); } } diff --git a/src/lay/lay/layMainWindow.h b/src/lay/lay/layMainWindow.h index 76b3e8276..6ffa374e2 100644 --- a/src/lay/lay/layMainWindow.h +++ b/src/lay/lay/layMainWindow.h @@ -725,7 +725,6 @@ private: double m_grid_micron; std::vector m_default_grids; bool m_default_grids_updated; - std::vector m_default_grid_actions; std::vector > m_key_bindings; bool m_new_layout_current_panel; bool m_synchronized_views;