Hand apply 73fb7a2a537ea736c5ea8305061e64e129b4878b from master; lose connection...

diff --git a/TO_PORT b/TO_PORT
index c6b782937f5e71aa66407f1f526cbdaf38a62eb4..fc1e9ecdade7a49caed5019665a2504f625353ab 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-4a9fbbf59a273a7d7be778cc3f8c27aed68ff49b
 20f9378678456f4c64f5d887e317a762faee6bde
 4af669f559e1afd5375c8e96ee65f651aea0ec9f
 22ff18bc9fb57419cbc81da553effd59638b488f

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 2da375ecdca76886a680429e40cda753bd153958..6ec52ff382c1a9d0369841d211a7cb43c67930c9 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -54,7 +54,7 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
        film_changed (Film::SEQUENCE_VIDEO);
        _snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence_video_toggled, this));
 
-       film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
+       _film_changed_connection = film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
 }
 
 void

diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 802aaf245acfedf2576b38c7b456c7d1eb1114c8..0ee3451543d9248a71e19219c5a0fa506e695010 100644 (file)
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -38,4 +38,5 @@ private:
        Timeline _timeline;
        wxCheckBox* _snap;
        wxCheckBox* _sequence_video;
+       boost::signals2::scoped_connection _film_changed_connection;
 };