Fix warning.

[vlc] / src / video_output / vout_intf.c

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 77b94e6696bd5f2f60c5063e867d80835c768abe..417e5ce1defa685c9ba4d12f0caa490725810e3f 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -515,8 +515,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
         {
             msg_Err( p_vout, "Could not get snapshot" );
             image_HandlerDelete( p_image );
-            vlc_object_kill( p_dest );
-            vlc_thread_join( p_dest );
+            vlc_object_signal( p_dest );
             vlc_object_release( p_dest );
             return VLC_EGENERIC;
         }
@@ -556,7 +555,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
         block_Release( p_block );
 
         /* Unlock the object */
-        vlc_object_signal( p_dest ); /* Why do we signal here */
+        vlc_object_signal( p_dest );
         vlc_object_release( p_dest );
 
         image_HandlerDelete( p_image );
@@ -609,16 +608,9 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
         }
 
         if( p_mypicturesdir == NULL )
-        {
-            if( asprintf( &val.psz_string, "%s", config_GetHomeDir() ) == -1 )
-                val.psz_string = NULL;
-        }
+            val.psz_string = strdup( config_GetHomeDir() );
         else
-        {
-            if( asprintf( &val.psz_string, p_mypicturesdir ) == -1 )
-                val.psz_string = NULL;
-            free( p_mypicturesdir );
-        }
+            val.psz_string = p_mypicturesdir;
     }
 
 #else