IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix up the Mac shutdown process to give Gnucash a chance to clean up without spewing critical errors about the main loop already running (because of calling gnc_shutdown in an event handler).

Browse Source 
BP

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20693 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls 2011-05-26 23:14:13 +00:00
parent 885899b1e8
commit c2c2715cf5
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gnome-utils/gnc-main-window.c
View File

@ -3401,12 +3401,25 @@ gnc_main_window_setup_window (GncMainWindow *window)
} }
#ifdef MAC_INTEGRATION #ifdef MAC_INTEGRATION
/* Event handlers for the shutdown process. Gnc_quartz_shutdown is
* connected to NSApplicationWillTerminate, the last chance to do
* anything before quitting. The problem is that it's launched from a
* CFRunLoop, not a g_main_loop, and if we call anything that would
* affect the main_loop we get an assert that we're in a subidiary
* loop.
*/
static void static void
gtk_quartz_shutdown (GtkOSXApplication *theApp, gpointer data) gtk_quartz_shutdown (GtkOSXApplication *theApp, gpointer data)
{ {
gnc_shutdown(0); /* Do Nothing. It's too late. */
} }
/* Should quit responds to NSApplicationBlockTermination; returning
* TRUE means "don't terminate", FALSE means "do terminate". If we
* decide that it's OK to terminate, then we queue a gnc_shutdown for
* the next idle time (because we're not running in the main loop) and
* then tell the OS not to terminate. That gives the gnc_shutdown an
* opportunity to shut down.
*/
static gboolean static gboolean
gtk_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window) gtk_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window)
{ {
@ -3421,8 +3434,9 @@ gtk_quartz_should_quit (GtkOSXApplication *theApp, GncMainWindow *window)
!gnc_file_save_in_progress(); !gnc_file_save_in_progress();
if (needs_save && gnc_main_window_prompt_for_save(GTK_WIDGET(window))) if (needs_save && gnc_main_window_prompt_for_save(GTK_WIDGET(window)))
return TRUE; return TRUE;
gnc_shutdown(0);
return FALSE; g_idle_add((GSourceFunc)gnc_shutdown, 0);
return TRUE;
} }
static void static void