Skip to content

Commit

Permalink
Ask for a forced quit when a user tries to re-close the window
Browse files Browse the repository at this point in the history
When the user calls Quit, the windows are disabled and the Evolution
prepares for quit. In case the quit takes longer than a minute, the user
is asked whether the Evolution should wait for the background tasks to
finish or quit. Sometimes the user wants to quit even earlier, thus let
it do it when it tries to close the window again.
  • Loading branch information
mcrha committed Nov 25, 2015
1 parent c495f5b commit 0c84d96
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions shell/e-shell.c
Expand Up @@ -2655,9 +2655,11 @@ e_shell_quit (EShell *shell,
goto remote;

/* Last Window reason can be used multiple times;
this is to not ask for a forced quit. */
if (reason == E_SHELL_QUIT_LAST_WINDOW && shell->priv->preparing_for_quit != NULL)
this is to ask for a forced quit before the timeout is reached. */
if (reason == E_SHELL_QUIT_LAST_WINDOW && shell->priv->preparing_for_quit != NULL) {
shell_prepare_for_quit (shell);
return TRUE;
}

if (!shell_request_quit (shell, reason))
return FALSE;
Expand Down

0 comments on commit 0c84d96

Please sign in to comment.