From e2b2004ec99736c8aaddd9f39d7c1a42ed4c909c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 17 Oct 2012 13:49:24 +0100
Subject: Fix subtitling logic in DCI naming.

---
 src/lib/film_state.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index 0d0bd6313..2717d55ee 100644
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -403,12 +403,10 @@ FilmState::dci_name () const
 
 	if (!audio_language.empty ()) {
 		d << audio_language;
-		if (with_subtitles) {
-			if (!subtitle_language.empty ()) {
-				d << "-" << subtitle_language;
-			} else {
-				d << "-XX";
-			}
+		if (!subtitle_language.empty() && with_subtitles) {
+			d << "-" << subtitle_language;
+		} else {
+			d << "-XX";
 		}
 			
 		d << "_";
-- 
cgit v1.2.3