Index: src/shrip-common.c
===================================================================
--- src/shrip-common.c	(révision 1523)
+++ src/shrip-common.c	(copie de travail)
@@ -1567,13 +1567,14 @@
   gchar *cwd, *message;
   gint result;
 
+  cwd = g_get_current_dir ();
+  if (chdir (ogmrip_fs_get_tmp_dir ()) < 0)
+    return OGMJOB_RESULT_ERROR;
+
   message = g_strdup (_("Merging audio and video streams"));
   g_signal_connect (container, "progress", G_CALLBACK (progress), message);
   g_signal_connect (container, "run", G_CALLBACK (run), NULL);
 
-  cwd = g_get_current_dir ();
-  chdir (ogmrip_fs_get_tmp_dir ());
-
   spawn = OGMJOB_SPAWN (container);
   result = ogmjob_spawn_run (OGMJOB_SPAWN (container), &tmp_error);
   spawn = NULL;
@@ -1584,7 +1585,9 @@
   if (tmp_error)
     g_propagate_error (error, tmp_error);
 
-  chdir (cwd);
+  if (chdir (cwd) < 0)
+    result = OGMJOB_RESULT_ERROR;
+
   g_free (cwd);
 
   return result;