Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 11:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-0

Browse source
This commit is contained in:
Seth Alves 2016-10-18 14:41:40 -07:00
commit 150c9b4bf8
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/src/AssignmentClient.cpp
View file

@ -57,8 +57,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
auto scriptableAvatar = DependencyManager::set<ScriptableAvatar>();
auto addressManager = DependencyManager::set<AddressManager>();
if (requestAssignmentType != Assignment::AvatarMixerType &&
requestAssignmentType != Assignment::AudioMixerType) {
if (requestAssignmentType == Assignment::AgentType) {
auto scriptEngines = DependencyManager::set<ScriptEngines>();
}

6
libraries/script-engine/src/BatchLoader.cpp
View file

@ -38,6 +38,12 @@ void BatchLoader::start() {
_started = true;
if (_urls.size() == 0) {
_finished = true;
emit finished(_data);
return;
}
for (const auto& rawURL : _urls) {
QUrl url = expandScriptUrl(normalizeScriptURL(rawURL));

5
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -1199,6 +1199,11 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac
}
}
// If there are no URLs left to download, don't bother attempting to download anything and return early
if (urls.size() == 0) {
return;
}
BatchLoader* loader = new BatchLoader(urls);
EntityItemID capturedEntityIdentifier = currentEntityIdentifier;
QUrl capturedSandboxURL = currentSandboxURL;