Skip to content
Permalink
Browse files

Fix double root path

  • Loading branch information
jgranick committed Oct 8, 2019
1 parent 21d64f9 commit 274ae5fe3bafa717462abe9d40674e498a3b09e8
Showing with 5 additions and 6 deletions.
  1. +5 −4 src/lime/utils/Assets.hx
  2. +0 −2 templates/haxe/ManifestResources.hx
@@ -40,7 +40,6 @@ class Assets
public static var onChange = new Event<Void->Void>();

private static var bundlePaths = new Map<String, String>();
private static var defaultRootPath:String;
private static var libraries(default, null) = new Map<String, AssetLibrary>();
private static var libraryPaths = new Map<String, String>();

@@ -440,7 +439,7 @@ class Assets
if (libraryPaths.exists(id))
{
path = libraryPaths[id];
rootPath = (defaultRootPath != "" ? defaultRootPath + "/" : "") + Path.directory(path);
rootPath = Path.directory(path);
}
else
{
@@ -449,8 +448,10 @@ class Assets
rootPath = path;
path += "/library.json";
}

rootPath = (defaultRootPath != "" ? defaultRootPath + "/" : "") + Path.directory(path);
else
{
rootPath = Path.directory(path);
}
path = __cacheBreak(path);
}

@@ -49,8 +49,6 @@ import sys.FileSystem;

}

Assets.defaultRootPath = rootPath;

#if (openfl && !flash && !display)
::if (assets != null)::::foreach assets::::if (type == "font")::openfl.text.Font.registerFont (__ASSET__OPENFL__::flatName::);
::end::::end::::end::

0 comments on commit 274ae5f

Please sign in to comment.
You can’t perform that action at this time.