summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorNathan Stewart <therealnathanstewart@gmail.com>2016-10-11 11:07:17 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-10-12 14:50:03 -0400
commit114bc97f9430d3dddfcbc60d766a647eb902b2e7 (patch)
tree4e338c3d7861776c3b91518bc62dbceab085def0 /gtk2_ardour
parentca98c7a0511a2282e3f3fcfd7c17d5c508be47bd (diff)
Fixes minor memory leak found in color_theme_manager.cpp:326
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/color_theme_manager.cc11
-rw-r--r--gtk2_ardour/color_theme_manager.h1
2 files changed, 11 insertions, 1 deletions
diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc
index be0278ef9b..fc2a823c68 100644
--- a/gtk2_ardour/color_theme_manager.cc
+++ b/gtk2_ardour/color_theme_manager.cc
@@ -165,6 +165,16 @@ ColorThemeManager::ColorThemeManager ()
show_all ();
}
+
+ColorThemeManager::~ColorThemeManager ()
+{
+ if (palette_group) {
+ palette_group->clear (true);
+ delete palette_group;
+ }
+}
+
+
void
ColorThemeManager::setup_modifiers ()
{
@@ -311,7 +321,6 @@ ColorThemeManager::build_palette_canvas (ArdourCanvas::Canvas& canvas, ArdourCan
for (uint32_t y = 0; y < height - box_size && color_num < color_limit; y += box_size) {
for (uint32_t x = 0; x < width - box_size && color_num < color_limit; x += box_size) {
ArdourCanvas::Rectangle* r = new ArdourCanvas::Rectangle (&group, ArdourCanvas::Rect (x, y, x + box_size, y + box_size));
-
string name = nc[color_num++].name;
UIConfiguration::Colors::iterator c = colors.find (name);
diff --git a/gtk2_ardour/color_theme_manager.h b/gtk2_ardour/color_theme_manager.h
index f3e9132a84..85759392e0 100644
--- a/gtk2_ardour/color_theme_manager.h
+++ b/gtk2_ardour/color_theme_manager.h
@@ -43,6 +43,7 @@ class ColorThemeManager : public Gtk::VBox, public OptionEditorComponent
{
public:
ColorThemeManager();
+ ~ColorThemeManager();
void reset_canvas_colors();
void on_color_theme_changed ();