Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 251367 | Differences between
and this patch

Collapse All | Expand All

(-)src/shrip-common.c (-4 / +7 lines)
Lines 1567-1579 Link Here
1567
  gchar *cwd, *message;
1567
  gchar *cwd, *message;
1568
  gint result;
1568
  gint result;
1569
1569
1570
  cwd = g_get_current_dir ();
1571
  if (chdir (ogmrip_fs_get_tmp_dir ()) < 0)
1572
    return OGMJOB_RESULT_ERROR;
1573
1570
  message = g_strdup (_("Merging audio and video streams"));
1574
  message = g_strdup (_("Merging audio and video streams"));
1571
  g_signal_connect (container, "progress", G_CALLBACK (progress), message);
1575
  g_signal_connect (container, "progress", G_CALLBACK (progress), message);
1572
  g_signal_connect (container, "run", G_CALLBACK (run), NULL);
1576
  g_signal_connect (container, "run", G_CALLBACK (run), NULL);
1573
1577
1574
  cwd = g_get_current_dir ();
1575
  chdir (ogmrip_fs_get_tmp_dir ());
1576
1577
  spawn = OGMJOB_SPAWN (container);
1578
  spawn = OGMJOB_SPAWN (container);
1578
  result = ogmjob_spawn_run (OGMJOB_SPAWN (container), &tmp_error);
1579
  result = ogmjob_spawn_run (OGMJOB_SPAWN (container), &tmp_error);
1579
  spawn = NULL;
1580
  spawn = NULL;
Lines 1584-1590 Link Here
1584
  if (tmp_error)
1585
  if (tmp_error)
1585
    g_propagate_error (error, tmp_error);
1586
    g_propagate_error (error, tmp_error);
1586
1587
1587
  chdir (cwd);
1588
  if (chdir (cwd) < 0)
1589
    result = OGMJOB_RESULT_ERROR;
1590
1588
  g_free (cwd);
1591
  g_free (cwd);
1589
1592
1590
  return result;
1593
  return result;

Return to bug 251367