Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-08 11:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: merge: fix infinite loop adding new settings after dropping files

Browse Source
This commit is contained in:
Moritz Bunkus 2015-09-18 19:48:10 +02:00
parent 80727a50c7
commit cf975b3176
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mkvtoolnix-gui/merge/input.cpp
View File

@ -788,6 +788,11 @@ Tab::addOrAppendFiles(bool append) {
addOrAppendFiles(append, fileNames, selectedSourceFile());
}
void
Tab::addFiles(QStringList const &fileNames) {
addOrAppendFiles(false, fileNames, QModelIndex{});
}
void
Tab::addOrAppendFiles(bool append,
QStringList const &fileNames,

1
src/mkvtoolnix-gui/merge/tab.h
View File

@ -63,6 +63,7 @@ public:
virtual QString title() const;
virtual void load(QString const &fileName);
virtual void cloneConfig(MuxConfig const &config);
virtual void addFiles(QStringList const &fileNames);
signals:
void removeThisTab();

2
src/mkvtoolnix-gui/merge/tool.cpp
View File

@ -329,7 +329,7 @@ Tool::addMultipleFilesToNewSettings(QStringList const &fileNames,
auto tab = currentTab();
Q_ASSERT(!!tab);
tab->addFilesToBeAddedOrAppendedDelayed(fileNamesToAdd);
tab->addFiles(fileNamesToAdd);
}
}