summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-19 17:14:28 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-19 18:58:24 +0100
commit7b12e1995891da95d898608215cfe7f3e8c3facc (patch)
tree7e22fd9321d7a93bd8dbcec08e92a692430e7985 /src/wx
parentbd453939da140ea994282e1c167ea5f8d02e2d94 (diff)
Some missing ui_signaller use.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/film_editor.cc2
-rw-r--r--src/wx/timeline.cc4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index fe332e335..83e8c619f 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -672,6 +672,8 @@ FilmEditor::film_changed (Film::Property p)
void
FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
{
+ ensure_ui_thread ();
+
if (!_film) {
/* We call this method ourselves (as well as using it as a signal handler)
so _film can be 0.
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 116ff8191..c7276a081 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -176,6 +176,8 @@ private:
void content_changed (int p, bool frequent)
{
+ ensure_ui_thread ();
+
if (p == ContentProperty::START || p == ContentProperty::LENGTH) {
force_redraw ();
}
@@ -378,6 +380,8 @@ Timeline::paint (wxPaintEvent &)
void
Timeline::playlist_changed ()
{
+ ensure_ui_thread ();
+
shared_ptr<const Film> fl = _film.lock ();
if (!fl) {
return;