luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a segfault.

This commit is contained in:
Matthias Koefferlein 2020-02-19 09:51:55 +01:00
parent 8a95b2e6f7
commit 9142479585
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lay/lay/layMainWindow.cc
View File

@ -1122,23 +1122,17 @@ MainWindow::config_finalize ()
}
}
for (std::vector<lay::Action *>::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<double>::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<std::string>::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);
}
}

1
src/lay/lay/layMainWindow.h
View File

@ -725,7 +725,6 @@ private:
double m_grid_micron;
std::vector<double> m_default_grids;
bool m_default_grids_updated;
std::vector<lay::Action *> m_default_grid_actions;
std::vector<std::pair<std::string, std::string> > m_key_bindings;
bool m_new_layout_current_panel;
bool m_synchronized_views;