subtitles: Remove unneeded clauses.

(cherry picked from commit f97effab) Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

subtitles: Remove unneeded clauses.
(cherry picked from commit f97effab) Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
9777ead1 · Hugo Beauzée-Luyssen · Jean-Baptiste Kempf · 2eaee528 · 9777ead1
Commit 9777ead1 authored Apr 10, 2012 by Hugo Beauzée-Luyssen Committed by Jean-Baptiste Kempf Apr 11, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

src/input/subtitles.c src/input/subtitles.c +3 -4

No files found.
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -338,13 +338,12 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
            strcpy_trim( tmp_fname_trim, tmp_fname_noext );
            i_prio = SUB_PRIORITY_NONE;
-            if( i_prio == SUB_PRIORITY_NONE && !strcmp( tmp_fname_trim, f_fname_trim ) )
+            if( !strcmp( tmp_fname_trim, f_fname_trim ) )
            {
                /* matches the movie name exactly */
                i_prio = SUB_PRIORITY_MATCH_ALL;
            }
-            if( i_prio == SUB_PRIORITY_NONE &&
+            else if( (tmp = strstr( tmp_fname_trim, f_fname_trim )) )
-                ( tmp = strstr( tmp_fname_trim, f_fname_trim ) ) )
            {
                /* contains the movie name */
                tmp += strlen( f_fname_trim );
@@ -360,7 +359,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
                    i_prio = SUB_PRIORITY_MATCH_LEFT;
                }
            }
-            if( i_prio == SUB_PRIORITY_NONE &&
+            else if( i_prio == SUB_PRIORITY_NONE &&
                j == 0 )
            {
                /* doesn't contain the movie name, prefer files in f_dir over subdirs */