griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T65702: Load factory erases setting without confirmation

Browse Source 
It could be argued this was correct behavior, since auto-save
defaults to 'on' nevertheless, auto-saving settings once
the user has disabled auto-save can lead to accidents.

Don't reset the preferences flag when resetting preferences.
This commit is contained in:
Campbell Barton
2019-06-11 21:49:05 +10:00
parent c9cc4ddf64
commit 43d3572655
1 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/blender/windowmanager/intern/wm_files.c
View File

@@ -1739,6 +1739,32 @@ void WM_OT_save_userpref(wmOperatorType *ot)
ot->exec = wm_userpref_write_exec;
}
/**
* When reading preferences, there are some exceptions for values which are reset.
*/
static void wm_userpref_read_exceptions(UserDef *userdef_curr,
const UserDef *userdef_prev,
const bool use_factory_settings)
{
#define USERDEF_RESTORE(member) \
{ \
userdef_curr->member = userdef_prev->member; \
} \
((void)0)
/* Current visible preferences category. */
USERDEF_RESTORE(userpref);
if (use_factory_settings) {
/* Preferences about the preferences.
* Technically correct not to reset however this causes issues in practice.
* Since loading factory settings will then overwrite your preferences on exit, see: T65702. */
USERDEF_RESTORE(pref_flag);
}
#undef USERDEF_RESTORE
}
static void rna_struct_update_when_changed(bContext *C,
Main *bmain,
PointerRNA *ptr_a,
@@ -1811,15 +1837,7 @@ static int wm_userpref_read_exec(bContext *C, wmOperator *op)
WM_init_state_app_template_get(),
NULL);
#define USERDEF_RESTORE(member) \
{ \
U.member = U_backup.member; \
} \
((void)0)
USERDEF_RESTORE(userpref);
#undef USERDEF_RESTORE
wm_userpref_read_exceptions(&U, &U_backup, use_factory_settings);
Main *bmain = CTX_data_main(C);
@@ -1883,6 +1901,7 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op)
bool use_userdef = false;
char filepath_buf[FILE_MAX];
const char *filepath = NULL;
UserDef U_backup = U;
if (!use_factory_settings) {
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "filepath");
@@ -1947,6 +1966,10 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op)
}
SET_FLAG_FROM_TEST(G.f, use_temporary_preferences, G_FLAG_USERPREF_NO_SAVE_ON_EXIT);
if (use_userdef) {
wm_userpref_read_exceptions(&U, &U_backup, use_factory_settings);
}
return OPERATOR_FINISHED;
}