From c2d2a515b4a6390484b8608527828bb99fa685c7 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 24 Dec 2016 00:06:42 +0000 Subject: [PATCH] Fix #4910: Title sequences get labelled incorrectly in game options --- src/title/TitleSequenceManager.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/title/TitleSequenceManager.cpp b/src/title/TitleSequenceManager.cpp index 7d06d73bc8..ba95b04cad 100644 --- a/src/title/TitleSequenceManager.cpp +++ b/src/title/TitleSequenceManager.cpp @@ -235,6 +235,8 @@ namespace TitleSequenceManager static void AddSequence(const utf8 * scanPath) { + TitleSequenceManagerItem item; + std::string path; bool isZip = true; if (String::Equals(Path::GetExtension(scanPath), ".txt", true)) @@ -244,13 +246,14 @@ namespace TitleSequenceManager path = std::string(utf8Path); Memory::Free(utf8Path); isZip = false; + item.Name = Path::GetFileName(path.c_str()); } else { path = std::string(scanPath); + item.Name = GetNameFromSequencePath(path); } - TitleSequenceManagerItem item; item.PredefinedIndex = GetPredefinedIndex(path); item.Path = path; if (item.PredefinedIndex != PREDEFINED_INDEX_CUSTOM) @@ -258,10 +261,6 @@ namespace TitleSequenceManager rct_string_id stringId = PredefinedSequences[item.PredefinedIndex].StringId; item.Name = String::Duplicate(language_get_string(stringId)); } - else - { - item.Name = GetNameFromSequencePath(path); - } item.IsZip = isZip; _items.push_back(item); }