jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1497 from cg2121/fix-autoremux-warning

Browse Source 
UI: Fix auto remux warning
This commit is contained in:
Jim 2018-09-25 15:05:54 -07:00 committed by GitHub
commit 94e44e698e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UI/window-remux.cpp
View File

@ -577,8 +577,11 @@ void RemuxQueueModel::endProcessing()
}
// Signal that the insertion point exists again.
beginInsertRows(QModelIndex(), queue.length(), queue.length());
endInsertRows();
if (!autoRemux) {
beginInsertRows(QModelIndex(), queue.length(), queue.length());
endInsertRows();
}
isProcessing = false;
@ -821,7 +824,7 @@ void OBSRemux::dropEvent(QDropEvent *ev)
QMessageBox::information(nullptr,
QTStr("Remux.NoFilesAddedTitle"),
QTStr("Remux.NoFilesAdded"), QMessageBox::Ok);
} else {
} else if (!autoRemux) {
QModelIndex insertIndex = queueModel->index(
queueModel->rowCount() - 1,
RemuxEntryColumn::InputPath);
@ -889,6 +892,7 @@ void OBSRemux::remuxNextEntry()
if (queueModel->beginNextEntry(inputPath, outputPath)) {
emit remux(inputPath, outputPath);
} else {
queueModel->autoRemux = autoRemux;
queueModel->endProcessing();
if (!autoRemux) {

2
UI/window-remux.hpp
View File

@ -118,6 +118,8 @@ public:
void clearFinished();
void clearAll();
bool autoRemux = false;
private:
struct RemuxQueueEntry
{