Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmg: Load chapters from Matroska files in read-only mode

Browse Source
This commit is contained in:
Moritz Bunkus 2013-04-09 22:10:00 +02:00
parent ab8e77a870
commit 09f1dd4291
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-09 Moritz Bunkus <moritz@bunkus.org>
* mmg: bug fix: Loading chapters from Matroska files will open the
file in read-only mode allowing to read from write-protected
files.
2013-04-04 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: All entries in chapters imported from MPLS

11
src/mmg/tabs/chapters.cpp
View File

@ -575,7 +575,7 @@ tab_chapters::load(wxString name) {
if (kax_analyzer_c::probe(wxMB(name))) {
analyzer = wx_kax_analyzer_cptr(new wx_kax_analyzer_c(this, wxMB(name)));
file_name = name;
if (!analyzer->process()) {
if (!analyzer->process(kax_analyzer_c::parse_mode_full, MODE_READ)) {
wxMessageBox(Z("This file could not be opened or parsed."), Z("File parsing failed"), wxOK | wxCENTER | wxICON_ERROR);
analyzer.reset();
@ -1670,7 +1670,14 @@ tab_chapters::is_empty() {
void
tab_chapters::write_chapters_to_matroska_file() {
kax_analyzer_c::update_element_result_e result = (0 == m_chapters->ListSize() ? analyzer->remove_elements(KaxChapters::ClassInfos.GlobalId) : analyzer->update_element(m_chapters));
kax_analyzer_c::update_element_result_e result;
try {
result = (0 == m_chapters->ListSize() ? analyzer->remove_elements(KaxChapters::ClassInfos.GlobalId) : analyzer->update_element(m_chapters));
} catch (mtx::mm_io::exception &) {
wxMessageBox(Z("Writing to the file failed. Typical reasons include the file being write-protected, locked by another process or you not having write permissions for the target directory."),
Z("Error writing Matroska file"), wxCENTER | wxOK | wxICON_ERROR, this);
return;
}
switch (result) {
case kax_analyzer_c::uer_success: