nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-17 19:18:06 -05:00
Code Issues Projects Releases Wiki Activity

Don't run toplevel callbacks in modal dialogs.

Browse Source 
Because some of them can call gtk_main_quit(), which completely
confuses the dialog box system.

[originally from svn r10029]
This commit is contained in:
Simon Tatham 2013-08-18 10:56:20 +00:00
parent b8e668cd9b
commit 6805bdcd6a
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
unix/gtkwin.c
View File

@ -1395,18 +1395,39 @@ void notify_remote_exit(void *frontend)
queue_toplevel_callback(exit_callback, inst); queue_toplevel_callback(exit_callback, inst);
} }
static void notify_toplevel_callback(void *frontend);
static gint quit_toplevel_callback_func(gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
notify_toplevel_callback(inst);
return 0;
}
static gint idle_toplevel_callback_func(gpointer data) static gint idle_toplevel_callback_func(gpointer data)
{ {
struct gui_data *inst = (struct gui_data *)data; struct gui_data *inst = (struct gui_data *)data;
run_toplevel_callbacks(); if (gtk_main_level() > 1) {
/*
* We don't run the callbacks if we're in the middle of a
* subsidiary gtk_main. Instead, ask for a callback when we
* get back out of the subsidiary main loop, so we can
* reschedule ourself then.
*/
gtk_quit_add(2, quit_toplevel_callback_func, inst);
} else {
run_toplevel_callbacks();
}
gtk_idle_remove(inst->toplevel_callback_idle_id); gtk_idle_remove(inst->toplevel_callback_idle_id);
return TRUE; return TRUE;
} }
void notify_toplevel_callback(void *frontend) static void notify_toplevel_callback(void *frontend)
{ {
struct gui_data *inst = (struct gui_data *)frontend; struct gui_data *inst = (struct gui_data *)frontend;