From e2f88798ab8ff79baef70cb703c803c0ea0d9844 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 5 Sep 2015 15:39:46 +0200 Subject: [PATCH] =?UTF-8?q?GUI:=20merge:=20set=20default=20track=20column?= =?UTF-8?q?=20to=20=C2=BBno=C2=AB=20for=20disabled=20tracks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Other columns like e.g. the language aren't set to empty when a track is disabled either. So let's be consistent here. See #1353. --- src/mkvtoolnix-gui/merge/track_model.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mkvtoolnix-gui/merge/track_model.cpp b/src/mkvtoolnix-gui/merge/track_model.cpp index 5af909a50..2885d1806 100644 --- a/src/mkvtoolnix-gui/merge/track_model.cpp +++ b/src/mkvtoolnix-gui/merge/track_model.cpp @@ -614,7 +614,10 @@ TrackModel::updateEffectiveDefaultTrackFlags() { // Step one: reset all flags to undefined. Do this for all tracks, // not just for regular & enabled ones. for (auto &track : *m_tracks) - track->m_effectiveDefaultTrackFlag = boost::none; + if (track->m_muxThis) + track->m_effectiveDefaultTrackFlag = boost::none; + else + track->m_effectiveDefaultTrackFlag = false; // Step two: check for explicitly set flags (set to yes/no). These // take precedence over everything else.