From b540d0e4bc858c22395c1960cf07f006cff5da01 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Wed, 31 Jul 2013 19:53:28 +1000 Subject: [PATCH] Fix check button handling in Memory Warning Dialog --- gtk2_ardour/ardour_ui.cc | 15 +++++---------- gtk2_ardour/ardour_ui.h | 1 - 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ec911a4fcd..4902968db8 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -827,13 +827,6 @@ ARDOUR_UI::starting () return 0; } -void -ARDOUR_UI::no_memory_warning () -{ - XMLNode node (X_("no-memory-warning")); - Config->add_instant_xml (node); -} - void ARDOUR_UI::check_memory_locking () { @@ -890,9 +883,6 @@ ARDOUR_UI::check_memory_locking () VBox* vbox = msg.get_vbox(); HBox hbox; CheckButton cb (_("Do not show this window again")); - - cb.signal_toggled().connect (sigc::mem_fun (*this, &ARDOUR_UI::no_memory_warning)); - hbox.pack_start (cb, true, false); vbox->pack_start (hbox); cb.show(); @@ -903,6 +893,11 @@ ARDOUR_UI::check_memory_locking () editor->ensure_float (msg); msg.run (); + + if (cb.get_active()) { + XMLNode node (X_("no-memory-warning")); + Config->add_instant_xml (node); + } } } } diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 0253c1ec0a..ff324fd6f9 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -692,7 +692,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr bool first_idle (); - void no_memory_warning (); void check_memory_locking (); bool check_audioengine();