From 8fdf1669a7918d8c625d2ef10df2225c86a85d76 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 12 Jul 2016 07:46:30 -0400
Subject: push2: fix up issues with object lifetimes and signals during
 shutdown

---
 libs/surfaces/push2/push2.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libs/surfaces/push2/push2.cc')

diff --git a/libs/surfaces/push2/push2.cc b/libs/surfaces/push2/push2.cc
index 412fc3c51b..2f48535746 100644
--- a/libs/surfaces/push2/push2.cc
+++ b/libs/surfaces/push2/push2.cc
@@ -40,6 +40,7 @@
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 
+#include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/rgb_macros.h"
 
 #include "canvas/colors.h"
@@ -141,8 +142,6 @@ Push2::Push2 (ARDOUR::Session& s)
 	, octave_shift (0)
 	, percussion (false)
 {
-	cerr << "new push2 @ " << this << "\n";
-
 	context = Cairo::Context::create (frame_buffer);
 
 	build_maps ();
@@ -176,15 +175,16 @@ Push2::Push2 (ARDOUR::Session& s)
 
 Push2::~Push2 ()
 {
-	cerr << "push2 deleted\n";
 	stop ();
+
+	delete track_mix_layout;
+	delete mix_layout;
+	delete scale_layout;
 }
 
 void
 Push2::port_registration_handler ()
 {
-	cerr << "preg for " << this << endl;
-
 	if (!_async_in && !_async_out) {
 		/* ports not registered yet */
 		return;
-- 
cgit v1.2.3