aboutsummaryrefslogtreecommitdiff
path: root/src/library_sdl.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-08-08 15:03:41 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-08-08 15:03:41 -0700
commit634bac9e1ed719c5779d3116a3797b3aef4b2012 (patch)
treeea6e3e39584431f09992e5637a750cd05f75b782 /src/library_sdl.js
parentfef6f254c305db507904d1068af4f9e25ce5769a (diff)
parent47c1d35c944c8ef954aa3d8de9686e35c2858a24 (diff)
Merge pull request #1470 from inolen/preload_path_fixes
file preload path fixes
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r--src/library_sdl.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index 19152646..64984628 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -10,7 +10,7 @@
// or otherwise).
var LibrarySDL = {
- $SDL__deps: ['$FS', '$Browser'],
+ $SDL__deps: ['$FS', '$PATH', '$Browser'],
$SDL: {
defaults: {
width: 320,
@@ -1291,11 +1291,7 @@ var LibrarySDL = {
}
if (!raw) {
- filename = FS.standardizePath(filename);
- if (filename[0] == '/') {
- // Convert the path to relative
- filename = filename.substr(1);
- }
+ filename = PATH.resolve(filename);
var raw = Module["preloadedImages"][filename];
if (!raw) {
if (raw === null) Module.printErr('Trying to reuse preloaded image, but freePreloadedMediaOnUse is set!');