From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 5 Feb 2015 14:13:28 +0000 (+0600)
Subject: [npo] Fix subtitles (Closes #3638)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=9e91449c8d1dae53eda6fb250384f0afa5122ce6;p=youtube-dl

[npo] Fix subtitles (Closes #3638)
---

diff --git a/youtube_dl/extractor/npo.py b/youtube_dl/extractor/npo.py
index 0580461bb..54be06a4e 100644
--- a/youtube_dl/extractor/npo.py
+++ b/youtube_dl/extractor/npo.py
@@ -159,14 +159,17 @@ class NPOIE(NPOBaseIE):
                     'quality': stream.get('kwaliteit'),
                 })
 
-        subtitles = {}
+        self._sort_formats(formats)
 
-        tt888 = metadata.get('tt888')
-        if self._have_to_download_any_subtitles and tt888 == 'ja':
+        subtitles = {}
+        if metadata.get('tt888') == 'ja':
             subtitles['nl'] = 'http://e.omroep.nl/tt888/%s' % video_id
-            subtitles = self.extract_subtitles(video_id, subtitles)
 
-        self._sort_formats(formats)
+        if self._downloader.params.get('listsubtitles', False):
+            self._list_available_subtitles(video_id, subtitles)
+            return
+
+        subtitles = self.extract_subtitles(video_id, subtitles)
 
         return {
             'id': video_id,