mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-03 17:33:25 +00:00
Issue #10899: Image Recovery and Welcome dialog conflicting with each other.
Since the Image Recovery dialog is blocking the main process (and requires an answer to be done first), let's simply move down the Welcome dialog to after this answer was given. This way, we simply won't have both dialogs in the same time.
This commit is contained in:
parent
920efa45b2
commit
d9c440614b
1 changed files with 13 additions and 13 deletions
26
app/app.c
26
app/app.c
|
@ -401,19 +401,6 @@ app_activate_callback (GimpCoreApp *app,
|
|||
*/
|
||||
gimp_rc_set_autosave (GIMP_RC (gimp->edit_config), TRUE);
|
||||
|
||||
/* check for updates *after* enabling config autosave, so that the timestamp
|
||||
* is saved
|
||||
*/
|
||||
gimp_update_auto_check (gimp->edit_config, gimp);
|
||||
|
||||
/* Setting properties to be used for the next run. */
|
||||
g_object_set (gimp->edit_config,
|
||||
/* Set this after gimp_update_auto_check(). */
|
||||
"config-version", GIMP_VERSION,
|
||||
/* Set this after gimp_restore(). */
|
||||
"prev-language", current_language,
|
||||
NULL);
|
||||
|
||||
#ifndef GIMP_CONSOLE_COMPILATION
|
||||
if (! gimp->no_interface)
|
||||
{
|
||||
|
@ -471,6 +458,19 @@ app_activate_callback (GimpCoreApp *app,
|
|||
}
|
||||
#endif
|
||||
|
||||
/* check for updates *after* enabling config autosave, so that the timestamp
|
||||
* is saved
|
||||
*/
|
||||
gimp_update_auto_check (gimp->edit_config, gimp);
|
||||
|
||||
/* Setting properties to be used for the next run. */
|
||||
g_object_set (gimp->edit_config,
|
||||
/* Set this after gimp_update_auto_check(). */
|
||||
"config-version", GIMP_VERSION,
|
||||
/* Set this after gimp_restore(). */
|
||||
"prev-language", current_language,
|
||||
NULL);
|
||||
|
||||
/* Load the images given on the command-line. */
|
||||
filenames = gimp_core_app_get_filenames (app);
|
||||
if (filenames != NULL)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue