2002-01-14 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

* frontends/command-line/main.c: If the user presses 2 times
          <ctrl>-c, abort.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3881 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2002-01-15 08:31:31 +00:00
parent a3b5f51c59
commit cebf18c307
2 changed files with 21 additions and 9 deletions

View File

@@ -1,3 +1,8 @@
2002-01-14 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* frontends/command-line/main.c: If the user presses 2 times
<ctrl>-c, abort.
2002-01-14 Colin Marquardt <colin@marquardt-home.de>
* libgphoto2_port/po/fr.po: Update from Jérôme (is ISO-8859-1 now).

View File

@@ -1310,20 +1310,27 @@ cli_error_print (char *format, ...)
static void
signal_exit (int signo)
{
/* If we already were told to cancel, abort. */
if (glob_cancel) {
if (!glob_quiet)
printf (_("\nAborting...\n"));
if (glob_camera)
gp_camera_unref (glob_camera);
if (glob_context)
gp_context_unref (glob_context);
if (!glob_quiet)
printf (_("Aborted.\n"));
exit (EXIT_FAILURE);
}
if (!glob_quiet)
printf(_("\nCancelling...\n"));
printf (_("\nCancelling...\n"));
glob_cancel = 1;
#if 0
/* If we've got a camera, unref it */
if (glob_camera) {
gp_camera_unref (glob_camera);
glob_camera = NULL;
}
if (strlen(glob_owd)>0)
chdir(glob_owd);
if (strlen (glob_owd) > 0)
chdir (glob_owd);
exit (EXIT_SUCCESS);
#endif