diff options
Diffstat (limited to 'src/core/resource/ResourceRequest.cpp')
| -rw-r--r-- | src/core/resource/ResourceRequest.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/resource/ResourceRequest.cpp b/src/core/resource/ResourceRequest.cpp index f820bc3..41aec75 100644 --- a/src/core/resource/ResourceRequest.cpp +++ b/src/core/resource/ResourceRequest.cpp @@ -146,6 +146,12 @@ bool ResourceRequest::deduce(Registry ®istry, Logger &logger) { bool ok = true; + // Make sure the given file name is not empty + if (path.empty()) { + logger.error("Filename may not be empty"); + return false; + } + // Try to deduce the mimetype if none was given if (mimetype.empty()) { mimetype = registry.getMimetypeForFilename(path); @@ -206,10 +212,10 @@ bool ResourceRequest::deduce(Registry ®istry, Logger &logger) if (resourceType != ResourceType::UNKNOWN) { supportedTypes = limitSupportedTypes(resourceType, supportedTypes); if (supportedTypes.empty()) { - logger.error( - std::string("File of type \"") + mimetype + - std::string("\" cannot be included with relationship ") + - Resource::getResourceTypeName(resourceType)); + logger.error(std::string("Resource of type \"") + mimetype + + std::string("\" and relationship \"") + + Resource::getResourceTypeName(resourceType) + + std::string("\" cannot be included here")); ok = false; } } else { |