From b2d9833f2bbebff7ddb2642ca8ba242adc51045f Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 3 Dec 2003 21:42:20 +0000 Subject: [PATCH] Upon loading settings some settings were not loaded correctly (strings were not allocated). Some settings were not saved either. --- ChangeLog | 4 ++++ src/mmg/tab_input.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 944937914..921277366 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-12-03 Moritz Bunkus + * mmg: bug fix: The "load settings" function did not load all + settings, and some strings were not allocated at all resulting in + a crash when a track was removed after loading these settings. + * mkvmerge: bug fix: The AAC packetizer was not working if packets were being read from a raw AAC file (it worked fine from MP4 and Matroska files). diff --git a/src/mmg/tab_input.cpp b/src/mmg/tab_input.cpp index bd3bd078d..a91768fb4 100644 --- a/src/mmg/tab_input.cpp +++ b/src/mmg/tab_input.cpp @@ -1057,6 +1057,7 @@ void tab_input::load(wxConfigBase *cfg) { f = &files[fidx]; delete f->file_name; + delete f->title; for (tidx = 0; tidx < f->tracks->size(); tidx++) { t = &(*f->tracks)[tidx]; @@ -1095,6 +1096,8 @@ void tab_input::load(wxConfigBase *cfg) { continue; } fi.file_name = new wxString(s); + cfg->Read("title", &s); + fi.title = new wxString(s); cfg->Read("container", &fi.container); fi.no_chapters = false; cfg->Read("no_chapters", &fi.no_chapters);