From d795a484f03732d9f6e53c5f1b9dcee33f45bb5f Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Mon, 21 Oct 2013 17:29:11 -0700
Subject: [PATCH] Mixer: Fix redundant operations in strip removal.

---
 mixer/src/Mixer_Strip.C | 1 -
 nonlib/JACK/Port.C      | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mixer/src/Mixer_Strip.C b/mixer/src/Mixer_Strip.C
index 9c9ad11..9ab687d 100644
--- a/mixer/src/Mixer_Strip.C
+++ b/mixer/src/Mixer_Strip.C
@@ -1242,7 +1242,6 @@ Mixer_Strip::command_move_right ( void )
 void
 Mixer_Strip::command_close ( void )
 {
-    mixer->remove( this );
     Fl::delete_widget( this );
 }
 
diff --git a/nonlib/JACK/Port.C b/nonlib/JACK/Port.C
index a15cb0c..b4612c9 100644
--- a/nonlib/JACK/Port.C
+++ b/nonlib/JACK/Port.C
@@ -335,6 +335,8 @@ namespace JACK
     const char **
     Port::connections ( void )
     {
+        ASSERT( _port, "Attempt to get connections of null port" );
+
         return jack_port_get_connections( _port );
     }