archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Remove files from recent-files list on failed open

Browse Source
This commit is contained in:
Campbell Barton
2015-08-05 21:25:28 +10:00
parent cae25ff240
commit c54df2ad47
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -398,6 +398,8 @@ void WM_file_autoexec_init(const char *filepath)
bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
{
/* assume automated tasks with background, don't write recent file list */
const bool do_history = (G.background == false) && (CTX_wm_manager(C)->op_undo_depth == 0);
bool success = false;
int retval;
@@ -420,9 +422,6 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
int G_f = G.f;
ListBase wmbase;
/* assume automated tasks with background, don't write recent file list */
const bool do_history = (G.background == false) && (CTX_wm_manager(C)->op_undo_depth == 0);
/* put aside screens to match with persistent windows later */
/* also exit screens and editors */
wm_window_match_init(C, &wmbase);
@@ -528,6 +527,19 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
BLI_assert(!"invalid 'retval'");
}
if (success == false) {
/* remove from recent files list */
if (do_history) {
RecentFile *recent = BLI_findstring_ptr(&G.recent_files, filepath, offsetof(RecentFile, filepath));
if (recent) {
MEM_freeN(recent->filepath);
BLI_freelinkN(&G.recent_files, recent);
write_history();
}
}
}
WM_cursor_wait(0);
return success;