Commit 6f4d9df0 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

call base_exit() before quitting the application using exit(). Fixes bug

2004-11-22  Sven Neumann  <sven@gimp.org>

	* app/app_procs.c (app_exit_after_callback): call base_exit()
	before quitting the application using exit(). Fixes bug #159019.

	* app/base/tile-swap.c: moved the warning about a non-empty swap
	file into #ifdef GIMP_UNSTABLE ... #endif.
parent eaec0edf
2004-11-22 Sven Neumann <sven@gimp.org>
* app/app_procs.c (app_exit_after_callback): call base_exit()
before quitting the application using exit(). Fixes bug #159019.
* app/base/tile-swap.c: moved the warning about a non-empty swap
file into #ifdef GIMP_UNSTABLE ... #endif.
2004-11-22 DindinX <dindinx@gimp.org>
 
* plug-ins/gfig/gfig-dialog.c: correctly initialize the Antialising
......
......@@ -56,7 +56,7 @@ Contributors:
Michael Natterer, Sven Neumann, David Odin, Manish Singh, Kevin Cozens,
Joao S. O. Bueno, Geert Jordaens, David Gowers, Øyvind Kolås, Cai Qian,
Simon Budig, Jakub Steiner, Philip Lafleur, Nickolay V. Shmyrev,
Karine Proot, S. Mukund, Dave Neary
Karine Proot, S. Mukund, Dave Neary, Keith Goatman
......
......@@ -411,6 +411,8 @@ app_exit_after_callback (Gimp *gimp,
#ifdef GIMP_UNSTABLE
g_main_loop_quit (loop);
#else
/* make sure that the swap file is removed before we quit */
base_exit ();
exit (EXIT_SUCCESS);
#endif
......
......@@ -150,6 +150,7 @@ static gboolean read_err_msg = TRUE;
static gboolean write_err_msg = TRUE;
#ifdef GIMP_UNSTABLE
static void
tile_swap_print_gaps (DefSwapFile *def_swap_file)
{
......@@ -166,6 +167,7 @@ tile_swap_print_gaps (DefSwapFile *def_swap_file)
gap->start, gap->end);
}
}
#endif
static void
tile_swap_exit1 (gpointer key,
......@@ -183,12 +185,15 @@ tile_swap_exit1 (gpointer key,
if (swap_file->swap_func == tile_swap_default)
{
def_swap_file = swap_file->user_data;
#ifdef GIMP_UNSTABLE
if (def_swap_file->swap_file_end != 0)
{
g_warning ("swap file not empty: \"%s\"\n",
gimp_filename_to_utf8 (swap_file->filename));
tile_swap_print_gaps (def_swap_file);
}
#endif
#ifdef G_OS_WIN32
/* should close before unlink */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment