diff options
Diffstat (limited to 'src/base_media_func.h')
| -rw-r--r-- | src/base_media_func.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/base_media_func.h b/src/base_media_func.h index 2117d7ff9..40d154d65 100644 --- a/src/base_media_func.h +++ b/src/base_media_func.h @@ -159,6 +159,11 @@ bool BaseMedia<Tbase_set>::AddFile(const char *filename, size_t basepath_length) /* don't allow recursive delete of all remaining items */ duplicate->next = NULL; + /* If the duplicate set is currently used (due to rescanning this can happen) + * update the currently used set to the new one. This will 'lie' about the + * version number until a new game is started which isn't a big problem */ + if (BaseMedia<Tbase_set>::used_set == duplicate) BaseMedia<Tbase_set>::used_set = set; + DEBUG(grf, 1, "Removing %s (%i) as base " SET_TYPE " set (duplicate)", duplicate->name, duplicate->version); delete duplicate; ret = true; |