Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 01:18:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix dereference of end iterator

Browse source
This commit is contained in:
Stephen Birarda 2017-09-07 12:02:07 -07:00
parent e4de869db6
commit bd36ba19b3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/assets/AssetServer.cpp
View file

@ -1106,7 +1106,7 @@ bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
_fileMappings.erase(it); _fileMappings.erase(it);
// in case we're overwriting, keep the current destination mapping for potential rollback // in case we're overwriting, keep the current destination mapping for potential rollback
auto oldDestinationMapping = _fileMappings.find(newPath)->second; auto oldDestinationIt = _fileMappings.find(newPath);
if (!oldSourceMapping.isEmpty()) { if (!oldSourceMapping.isEmpty()) {
_fileMappings[newPath] = oldSourceMapping; _fileMappings[newPath] = oldSourceMapping;
@ -1120,9 +1120,9 @@ bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
// we couldn't persist the renamed mapping, rollback and return failure // we couldn't persist the renamed mapping, rollback and return failure
_fileMappings[oldPath] = oldSourceMapping; _fileMappings[oldPath] = oldSourceMapping;
if (!oldDestinationMapping.isNull()) { if (oldDestinationIt != _fileMappings.end()) {
// put back the overwritten mapping for the destination path // put back the overwritten mapping for the destination path
_fileMappings[newPath] = oldDestinationMapping; _fileMappings[newPath] = oldDestinationIt->second;
} else { } else {
// clear the new mapping // clear the new mapping
_fileMappings.erase(_fileMappings.find(newPath)); _fileMappings.erase(_fileMappings.find(newPath));