modification to make generic MIDI actually work again

git-svn-id: svn://localhost/ardour2/trunk@673 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 6 deletions

diff --git a/libs/gtkmm2ext/popup.cc b/libs/gtkmm2ext/popup.cc
index 0a48ebfc59..a8ffc4af66 100644
--- a/libs/gtkmm2ext/popup.cc
+++ b/libs/gtkmm2ext/popup.cc
@@ -73,11 +73,12 @@ PopUp::remove ()
 {
 	hide ();
 
+	if (popdown_time != 0 && timeout != -1) {
+		gtk_timeout_remove (timeout);
+	}
+
 	if (delete_on_hide) {
 		std::cerr << "deleting prompter\n";
-		if (popdown_time != 0 && timeout != -1) {
-			gtk_timeout_remove (timeout);
-		}
 		gtk_idle_add (idle_delete, this);
 	}
 }
@@ -125,11 +126,12 @@ PopUp::on_delete_event (GdkEventAny* ev)
 {
 	hide();
 
+	if (popdown_time != 0 && timeout != -1) {
+		gtk_timeout_remove (timeout);
+	}	
+
 	if (delete_on_hide) {
 		std::cerr << "deleting prompter\n" << endl;
-		if (popdown_time != 0 && timeout != -1) {
-			gtk_timeout_remove (timeout);
-		}
 		gtk_idle_add (idle_delete, this);
 	}