From 84410f770b2a5549eb84223b97eaf474b3750d52 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 13 Feb 2013 20:22:02 -0800 Subject: [PATCH] Fix loading subtitles from Matroska files without track names --- aegisub/src/mkv_wrap.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aegisub/src/mkv_wrap.cpp b/aegisub/src/mkv_wrap.cpp index 93d39e35a..533cfa45d 100644 --- a/aegisub/src/mkv_wrap.cpp +++ b/aegisub/src/mkv_wrap.cpp @@ -152,7 +152,11 @@ void MatroskaWrapper::GetSubtitles(agi::fs::path const& filename, AssFile *targe std::string CodecID(trackInfo->CodecID); if (CodecID == "S_TEXT/SSA" || CodecID == "S_TEXT/ASS" || CodecID == "S_TEXT/UTF8") { tracksFound.push_back(track); - tracksNames.emplace_back(str(boost::format("%d (%s %s): %s") % track % CodecID % trackInfo->Language % trackInfo->Name)); + tracksNames.emplace_back(str(boost::format("%d (%s %s)") % track % CodecID % trackInfo->Language)); + if (trackInfo->Name) { + tracksNames.back() += ": "; + tracksNames.back() += trackInfo->Name; + } } }