aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-07-18 18:40:23 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-07-18 18:40:23 -0700
commita148e63c4cc952b9f4fbc24bdffffba132c9ef09 (patch)
treeb4a57c6ddc94e9655d7dd60e7d8744df6ace6b12
parent076a9d247bde6cdba54065b8aaa9ba0400c9da71 (diff)
workaround for chromium bug 124926 in another necessary place
-rw-r--r--tools/file_packager.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/file_packager.py b/tools/file_packager.py
index bb03667b..b02eac24 100644
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -257,7 +257,7 @@ for file_ in data_files:
%(prepare)s
Module['FS_createPreloadedFile']('/%(dirname)s', '%(basename)s', byteArray, true, true, function() {
%(finish)s
- });
+ }%(fail)s);
};
Module['addRunDependency']('fp %(filename)s');
%(varname)s.send(null);
@@ -268,7 +268,8 @@ for file_ in data_files:
'dirname': os.path.dirname(filename),
'basename': os.path.basename(filename),
'prepare': prepare,
- 'finish': finish
+ 'finish': finish,
+ 'fail': '' if filename[-4:] not in AUDIO_SUFFIXES else ''', function() { Module['removeRunDependency']('fp %s') }''' % filename # workaround for chromium bug 124926 (still no audio with this, but at least we don't hang)
}
else:
assert 0