X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fhb.c;h=390e566d2494a25381a5ac556502da40f5c4eac7;hb=cdaae4f3b1390847b750ca69d605645b7b54074f;hp=f73a2437ecac31a970c4822f0f434c635f19c13a;hpb=8eed51c6a3d7406c814064bd74f1c8be3cec7cb6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/hb.c b/libhb/hb.c
index f73a2437..390e566d 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -867,15 +867,11 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
     /* Copy the audio track(s) we want */
     title_copy->list_audio = hb_list_init();
 
-    /* Do nothing about audio during first pass */
-    if( job->pass == 0 || job->pass == 2 )
+    for( i = 0; i < hb_list_count(job->list_audio); i++ )
     {
-        for( i = 0; i < hb_list_count(job->list_audio); i++ )
+        if( ( audio = hb_list_item( job->list_audio, i ) ) )
         {
-            if( ( audio = hb_list_item( job->list_audio, i ) ) )
-            {
-                hb_list_add( title_copy->list_audio, hb_audio_copy(audio) );
-            }
+            hb_list_add( title_copy->list_audio, hb_audio_copy(audio) );
         }
     }
 
@@ -1310,19 +1306,22 @@ static void thread_func( void * _h )
 
     /* Remove temp folder */
     dir = opendir( dirname );
-    while( ( entry = readdir( dir ) ) )
+    if (dir)
     {
-        char filename[1024];
-        if( entry->d_name[0] == '.' )
+        while( ( entry = readdir( dir ) ) )
         {
-            continue;
+            char filename[1024];
+            if( entry->d_name[0] == '.' )
+            {
+                continue;
+            }
+            memset( filename, 0, 1024 );
+            snprintf( filename, 1023, "%s/%s", dirname, entry->d_name );
+            unlink( filename );
         }
-        memset( filename, 0, 1024 );
-        snprintf( filename, 1023, "%s/%s", dirname, entry->d_name );
-        unlink( filename );
+        closedir( dir );
+        rmdir( dirname );
     }
-    closedir( dir );
-    rmdir( dirname );
 }
 
 /**