diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-06-12 10:53:18 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-06-12 10:53:18 +0300 |
commit | 75958326ade000bc391be90734aac1a28dde3ae2 (patch) | |
tree | f43b40d5736e6b0276fddbc48d7fc7c02592c961 | |
parent | fd2e143eaff85993da4235bbd64ab5d3f36bc8b3 (diff) |
WM: re-enable auto-save after loading the users preferences
Minor change, only apples when loading factory settings,
then reverting to saved.
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 1feab316010..0c525d6946c 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1829,9 +1829,7 @@ static int wm_userpref_read_exec(bContext *C, wmOperator *op) NULL); wm_userpref_read_exceptions(&U, &U_backup); - if (use_factory_settings) { - G.f |= G_FLAG_USERPREF_NO_SAVE_ON_EXIT; - } + SET_FLAG_FROM_TEST(G.f, use_factory_settings, G_FLAG_USERPREF_NO_SAVE_ON_EXIT); Main *bmain = CTX_data_main(C); @@ -1960,9 +1958,7 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op) if (use_userdef) { wm_userpref_read_exceptions(&U, &U_backup); - if (use_factory_settings) { - G.f |= G_FLAG_USERPREF_NO_SAVE_ON_EXIT; - } + SET_FLAG_FROM_TEST(G.f, use_factory_settings, G_FLAG_USERPREF_NO_SAVE_ON_EXIT); } return OPERATOR_FINISHED; |