make any asset path relative to assets dir

This commit is contained in:
Stephen Birarda 2016-02-11 15:49:13 -08:00
parent 8c2d69f865
commit 27d338e81c
2 changed files with 2 additions and 3 deletions
assignment-client/src/assets
domain-server/resources

View file

@ -89,7 +89,7 @@ void AssetServer::completeSetup() {
if (assetsPath.isRelative()) {
// if the domain settings passed us a relative path, make an absolute path that is relative to the
// default data directory
absoluteFilePath = ServerPathUtils::getDataFilePath(assetsPathString);
absoluteFilePath = ServerPathUtils::getDataFilePath("assets/" + assetsPathString);
}
_resourcesDirectory = QDir(absoluteFilePath);

View file

@ -184,8 +184,7 @@
"type": "string",
"label": "Assets Path",
"help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
"placeholder": "assets",
"default": "assets",
"default": "",
"advanced": true
}
]