diff options
| -rw-r--r-- | src/core/resource/ResourceManager.cpp | 2 | ||||
| -rw-r--r-- | src/core/resource/ResourceRequest.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/filesystem/FileLocator.cpp | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/core/resource/ResourceManager.cpp b/src/core/resource/ResourceManager.cpp index e3edfc8..cc53e0a 100644 --- a/src/core/resource/ResourceManager.cpp +++ b/src/core/resource/ResourceManager.cpp @@ -326,7 +326,7 @@ Rooted<Node> ResourceManager::getNode(Manager &mgr, const Resource &resource) SourceContextCallback ResourceManager::getSourceContextCallback() { return [this](const SourceLocation &location) { - return this->readContext(location); + return this->readContext(location, 80); }; } } diff --git a/src/core/resource/ResourceRequest.cpp b/src/core/resource/ResourceRequest.cpp index 5e5bff3..f01a324 100644 --- a/src/core/resource/ResourceRequest.cpp +++ b/src/core/resource/ResourceRequest.cpp @@ -213,7 +213,7 @@ bool ResourceRequest::deduce(Registry ®istry, Logger &logger) // Autocompletion already tries to determine the file path, so // if an empty list is returned, this means that the resource // is explicitly not found - logger.error(std::string("Resource not found:") + path); + logger.error(std::string("Resource not found: ") + path); ok = false; } } @@ -265,7 +265,7 @@ bool ResourceRequest::locate(Registry ®istry, Logger &logger, Resource &resource) const { if (!registry.locateResource(resource, path, resourceType, relativeTo)) { - logger.error(std::string("Resource not found:") + path); + logger.error(std::string("Resource not found: ") + path); return false; } return true; diff --git a/src/plugins/filesystem/FileLocator.cpp b/src/plugins/filesystem/FileLocator.cpp index d2b4bb6..2fd5483 100644 --- a/src/plugins/filesystem/FileLocator.cpp +++ b/src/plugins/filesystem/FileLocator.cpp @@ -116,11 +116,6 @@ void FileLocator::addDefaultSearchPaths() #ifndef NDEBUG addDefaultSearchPaths(SpecialPaths::getDebugDataDir()); #endif - // also add working directory. - addSearchPath(".", {ResourceType::UNKNOWN, ResourceType::DOMAIN_DESC, - ResourceType::TYPESYSTEM, ResourceType::DOCUMENT, - ResourceType::ATTRIBUTES, ResourceType::STYLESHEET, - ResourceType::SCRIPT, ResourceType::DATA}); } void FileLocator::addUnittestSearchPath(const std::string &subdir, |