From: Carl Hetherington <cth@carlh.net>
Date: Mon, 8 Dec 2014 13:18:34 +0000 (+0000)
Subject: Hand apply 73fb7a2a537ea736c5ea8305061e64e129b4878b from master; lose connection... 
X-Git-Tag: v2.0.48~427
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=726f18338c5aaf9119bd10517d23584e32fdeccb;p=dcpomatic.git

Hand apply 73fb7a2a537ea736c5ea8305061e64e129b4878b from master; lose connection to Film when destroying TimelineDialog.
---

diff --git a/TO_PORT b/TO_PORT
index c6b782937..fc1e9ecda 100644
--- 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 2da375ecd..6ec52ff38 100644
--- 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 802aaf245..0ee345154 100644
--- 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;
 };