[vlc-commits] subtitles: Remove unneeded clause

[Hugo Beauzée-Luyssen]

vlc/vlc-2.0 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Tue Apr 10 16:24:59 2012 +0200| [84cb4eb92ea6d08901961d365aee8fef44062cfa] | committer: Jean-Baptiste Kempf

subtitles: Remove unneeded clause
(cherry picked from commit c517279280c28114ef0ceb1bf5e8a99cf6ce436f)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=84cb4eb92ea6d08901961d365aee8fef44062cfa
---

 src/input/subtitles.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index ec646e8..e3cecda 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -359,8 +359,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
                     i_prio = SUB_PRIORITY_MATCH_LEFT;
                 }
             }
-            else if( i_prio == SUB_PRIORITY_NONE &&
-                j == -1 )
+            else if( j == -1 )
             {
                 /* doesn't contain the movie name, prefer files in f_dir over subdirs */
                 i_prio = SUB_PRIORITY_MATCH_NONE;