Fix bug #2398, "Race when closing compose during drafting"

Thanks to Michael Schwendt for spotting the problem.

diff --git a/src/compose.c b/src/compose.c
index 41f0554bd956c370d9c2506b5d94355f4191cf1b..6f4c8b9cbcf8a7b5508f02977619d32c4c50f9c5 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -11453,16 +11453,28 @@ gboolean compose_close(Compose *compose)
 {
        gint x, y;
 
 {
        gint x, y;
 

+       cm_return_val_if_fail(compose, FALSE);
+

        if (!g_mutex_trylock(compose->mutex)) {
                /* we have to wait for the (possibly deferred by auto-save)
                 * drafting to be done, before destroying the compose under
                 * it. */
                debug_print("waiting for drafting to finish...\n");
                compose_allow_user_actions(compose, FALSE);
        if (!g_mutex_trylock(compose->mutex)) {
                /* we have to wait for the (possibly deferred by auto-save)
                 * drafting to be done, before destroying the compose under
                 * it. */
                debug_print("waiting for drafting to finish...\n");
                compose_allow_user_actions(compose, FALSE);

-               g_timeout_add (500, (GSourceFunc) compose_close, compose);
+               if (compose->close_timeout_tag == 0) {
+                       compose->close_timeout_tag = 
+                               g_timeout_add (500, (GSourceFunc) compose_close,
+                               compose);
+               }

                return FALSE;
        }
                return FALSE;
        }

-       cm_return_val_if_fail(compose, FALSE);
+       
+       if (compose->close_timeout_tag) {
+               /* let the close be done by the deferred callback */
+               g_mutex_unlock(compose->mutex);
+               return FALSE;
+       }
+

        gtkut_widget_get_uposition(compose->window, &x, &y);
        if (!compose->batch) {
                prefs_common.compose_x = x;
        gtkut_widget_get_uposition(compose->window, &x, &y);
        if (!compose->batch) {
                prefs_common.compose_x = x;

diff --git a/src/compose.h b/src/compose.h
index 992989b1adfa9087077b24930b89823d06e24208..2d08a3b035627217dcf77dac716c8d523abc61cd 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -235,6 +235,7 @@ struct _Compose
 
        gboolean automatic_break;
        GMutex *mutex;
 
        gboolean automatic_break;
        GMutex *mutex;

+       gint close_timeout_tag;

        gchar *orig_charset;
        gint set_cursor_pos;
        
        gchar *orig_charset;
        gint set_cursor_pos;