Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class
This commit is contained in:
commit
df4fd7df7f
118 changed files with 2410 additions and 822 deletions
|
@ -155,6 +155,9 @@ bool FlameCreationTask::updateInstance()
|
|||
|
||||
old_files.remove(file.key());
|
||||
files_iterator = files.erase(files_iterator);
|
||||
|
||||
if (files_iterator != files.begin())
|
||||
files_iterator--;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -181,7 +184,7 @@ bool FlameCreationTask::updateInstance()
|
|||
fileIds.append(QString::number(file.fileId));
|
||||
}
|
||||
|
||||
auto* raw_response = new QByteArray;
|
||||
auto raw_response = std::make_shared<QByteArray>();
|
||||
auto job = api.getFiles(fileIds, raw_response);
|
||||
|
||||
QEventLoop loop;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue