From c0e04acd1e9875fa67800a7861bd8a370157b49f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 22 Oct 2012 13:33:11 +0100
Subject: Fix crash on using delay; fix x-thread GUI access caused by FilmState
 default copy constructor copying its Changed signal's connections; fix up
 delay setup after film examine.

---
 src/wx/film_editor.cc | 2 ++
 src/wx/film_viewer.cc | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/wx')

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 5d6513648..47e093b36 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -401,6 +401,8 @@ FilmEditor::subtitle_scale_changed (wxCommandEvent &)
 void
 FilmEditor::film_changed (FilmState::Property p)
 {
+	ensure_ui_thread ();
+	
 	if (!_film || _ignore_changes == p) {
 		return;
 	}
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 8c1ce34e0..526233833 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -262,6 +262,8 @@ FilmViewer::slider_changed (wxCommandEvent &)
 void
 FilmViewer::film_changed (FilmState::Property p)
 {
+	ensure_ui_thread ();
+	
 	switch (p) {
 	case FilmState::THUMBS:
 		if (_film && _film->thumbs().size() > 1) {
-- 
cgit v1.2.3