justdan96/tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crashes when removing audio/subtitle tracks from the main window (#340)

Browse Source 
Indices in both combo boxes must be updated, since an audio track index might
have changed when a subtitle track is removed and vice versa : there is only one
array which holds information about tracks that these combo boxes reference via
the data contained in their items' UserRoles.
This commit is contained in:
Daniel Kamil Kozar 2020-09-17 01:36:56 +02:00 committed by GitHub
parent c73fb1ef86
commit 2a4489d060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tsMuxerGUI/tsmuxerwindow.cpp
View File

@ -1,6 +1,7 @@
#include "tsmuxerwindow.h"
#include <QColorDialog>
#include <QDebug>
#include <QDesktopServices>
#include <QDir>
#include <QDropEvent>
@ -722,13 +723,19 @@ void TsMuxerWindow::removeTrackFromDefaultComboBox(QComboBox *targetComboBox, QC
{
targetCheckBox->setChecked(false);
}
for (int i = comboBoxIdx + 1; i < targetComboBox->count(); ++i)
{
auto curTrackIdx = targetComboBox->itemData(i).toInt();
targetComboBox->setItemData(i, curTrackIdx - 1);
}
targetComboBox->removeItem(comboBoxIdx);
updateTracksComboBox(targetComboBox);
}
static void fixupIndices(QComboBox *comboBox, int removedTrackIdx)
{
for (int i = 0; i < comboBox->count(); ++i)
{
auto trackIdx = comboBox->itemData(i).toInt();
if (trackIdx > removedTrackIdx)
{
comboBox->setItemData(i, trackIdx - 1);
}
}
}
void TsMuxerWindow::removeTrackFromDefaultComboBox(int trackRowIdx)
@ -745,6 +752,10 @@ void TsMuxerWindow::removeTrackFromDefaultComboBox(int trackRowIdx)
removeTrackFromDefaultComboBox(ui->defaultSubTrackComboBox, ui->defaultSubTrackCheckBox, comboBoxIdx,
trackRowIdx);
}
fixupIndices(ui->defaultAudioTrackComboBox, trackRowIdx);
fixupIndices(ui->defaultSubTrackComboBox, trackRowIdx);
updateTracksComboBox(ui->defaultAudioTrackComboBox);
updateTracksComboBox(ui->defaultSubTrackComboBox);
}
void TsMuxerWindow::updateTracksComboBox(QComboBox *comboBox)
@ -757,11 +768,8 @@ void TsMuxerWindow::updateTracksComboBox(QComboBox *comboBox)
}
}
#include <QDebug>
void TsMuxerWindow::moveTrackInDefaultComboBox(int oldTrackRowIdx, int newTrackRowIdx)
{
qDebug() << oldTrackRowIdx << newTrackRowIdx;
auto currentSubTrack = ui->defaultSubTrackComboBox->currentData();
auto currentAudioTrack = ui->defaultAudioTrackComboBox->currentData();
ui->defaultSubTrackComboBox->clear();
@ -2163,6 +2171,7 @@ void TsMuxerWindow::delTracksByFileName(const QString &fileName)
void TsMuxerWindow::deleteTrack(int idx)
{
disableUpdatesCnt++;
removeTrackFromDefaultComboBox(idx);
delete getCodecInfo(idx);
int lastItemIndex = idx; // trackLV.items[idx].index;
ui->trackLV->removeRow(idx);
@ -2192,7 +2201,6 @@ void TsMuxerWindow::deleteTrack(int idx)
ui->removeTrackBtn->setEnabled(ui->trackLV->currentItem() != 0);
disableUpdatesCnt--;
trackLVItemSelectionChanged();
removeTrackFromDefaultComboBox(idx);
}
void TsMuxerWindow::updateNum()