Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 09:44:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix upload leak, return error for failed load

Browse source
This commit is contained in:
Stephen Birarda 2015-08-27 15:12:08 -07:00
parent 46990184d6
commit 549c514400
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/ui/AssetUploadDialogFactory.cpp
View file

@ -131,6 +131,9 @@ void AssetUploadDialogFactory::handleUploadFinished(AssetUpload* upload, const Q
case AssetUpload::TooLarge:
additionalError = "The uploaded content was too large and could not be stored in the asset-server.";
break;
case AssetUpload::ErrorLoadingFile:
additionalError = "The file could not be opened. Please check your permissions and try again.";
break;
default:
// not handled, do not show a message box
return;
@ -139,6 +142,8 @@ void AssetUploadDialogFactory::handleUploadFinished(AssetUpload* upload, const Q
// display a message box with the error
showErrorDialog(QFileInfo(upload->getFilename()).fileName(), additionalError);
}
upload->deleteLater();
}
void AssetUploadDialogFactory::showErrorDialog(const QString& filename, const QString& additionalError) {

6
libraries/networking/src/AssetUpload.cpp
View file

@ -57,5 +57,11 @@ void AssetUpload::start() {
emit finished(this, hash);
}
});
} else {
// we couldn't open the file - set the error result
_result = ErrorLoadingFile;
// emit that we are done
emit finished(this, QString());
}
}

3
libraries/networking/src/AssetUpload.h
View file

@ -28,7 +28,8 @@ public:
Success = 0,
Timeout,
TooLarge,
PermissionDenied
PermissionDenied,
ErrorLoadingFile
};
AssetUpload(QObject* parent, const QString& filename);