Set up streams after changing content, otherwise we are anticipating things that have not happened yet.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index fb3fb4cde..f36614689 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -899,6 +899,13 @@ Film::set_content (string c)
 			set_content_audio_streams (d.audio->audio_streams ());
 		}
 
+		{
+			boost::mutex::scoped_lock lm (_state_mutex);
+			_content = c;
+		}
+		
+		signal_changed (CONTENT);
+		
 		/* Start off with the first audio and subtitle streams */
 		if (d.audio && !d.audio->audio_streams().empty()) {
 			set_content_audio_stream (d.audio->audio_streams().front());
@@ -908,13 +915,6 @@ Film::set_content (string c)
 			set_subtitle_stream (d.video->subtitle_streams().front());
 		}
 		
-		{
-			boost::mutex::scoped_lock lm (_state_mutex);
-			_content = c;
-		}
-		
-		signal_changed (CONTENT);
-		
 		examine_content ();
 
 	} catch (...) {