diff options
author | Ton Roosendaal <ton@blender.org> | 2013-01-02 20:10:03 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-01-02 20:10:03 +0400 |
commit | c0e1f23e5a6ade738aea75571f2fe374bfecd854 (patch) | |
tree | f433e8227a5834aaa9f303c7004dce604df753b0 /source/blender/windowmanager/intern/wm_operators.c | |
parent | dadb1ccd9298688addf811dd62e6dcc6b4f49a45 (diff) |
Bug fix - post 2.65a
New option "Keep Session" was not using "untitled.blend" as default save name,
in case a startup.blend was kept as session. Could give bad accidents.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 39164995cc5..751ccd4aacd 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2129,8 +2129,11 @@ void wm_recover_last_session(bContext *C, ReportList *reports) /* XXX bad global... fixme */ if (G.main->name[0]) G.file_loaded = 1; /* prevents splash to show */ - else + else { G.relbase_valid = 0; + G.save_over = 0; /* start with save preference untitled.blend */ + } + } } @@ -2168,7 +2171,7 @@ static int wm_recover_auto_save_exec(bContext *C, wmOperator *op) WM_file_read(C, path, op->reports); G.fileflags &= ~G_FILE_RECOVER; - + return OPERATOR_FINISHED; } |