AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-15 18:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix rare case where Module.saveNode would still throw an error and hence abort the game (Thanks Swoozy)

Browse Source
This commit is contained in:
UnknownShadow200 2021-07-09 07:33:25 +10:00
parent 60585abaaa
commit a801bf6fd5
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/interop_web.js
View File

@ -132,7 +132,7 @@ mergeInto(LibraryManager.library, {
//######################################################################################################################## //########################################################################################################################
interop_InitFilesystem: function(buffer) { interop_InitFilesystem: function(buffer) {
// if interop_SaveNode is directly defined as a function, it is wrongly optimised // if interop_SaveNode is directly defined as a function, it is wrongly optimised
// out when compilingas the function is not directly referenced by any C code // out when compiling as the function is not directly referenced by any C code
Module.saveNode = function(path) { Module.saveNode = function(path) {
var callback = function(err) { var callback = function(err) {
if (!err) return; if (!err) return;
@ -147,23 +147,30 @@ mergeInto(LibraryManager.library, {
path = lookup.path; path = lookup.path;
node = lookup.node; node = lookup.node;
stat = node.node_ops.getattr(node); stat = node.node_ops.getattr(node);
if (FS.isDir(stat.mode)) {
entry = { timestamp: stat.mtime, mode: stat.mode };
} else {
// Performance consideration: storing a normal JavaScript array to a IndexedDB is much slower than storing a typed array.
// Therefore always convert the file contents to a typed array first before writing the data to IndexedDB.
node.contents = MEMFS.getFileDataAsTypedArray(node);
entry = { timestamp: stat.mtime, mode: stat.mode, contents: node.contents };
}
} catch (err) { } catch (err) {
return callback(err); return callback(err);
} }
if (FS.isDir(stat.mode)) {
entry = { timestamp: stat.mtime, mode: stat.mode };
} else {
// Performance consideration: storing a normal JavaScript array to a IndexedDB is much slower than storing a typed array.
// Therefore always convert the file contents to a typed array first before writing the data to IndexedDB.
node.contents = MEMFS.getFileDataAsTypedArray(node);
entry = { timestamp: stat.mtime, mode: stat.mode, contents: node.contents };
}
IDBFS.getDB('/classicube', function(err, db) { IDBFS.getDB('/classicube', function(err, db) {
if (err) return callback(err); if (err) return callback(err);
var transaction = db.transaction([IDBFS.DB_STORE_NAME], 'readwrite'); var transaction, store;
var store = transaction.objectStore(IDBFS.DB_STORE_NAME);
// can still throw errors here
try {
transaction = db.transaction([IDBFS.DB_STORE_NAME], 'readwrite');
store = transaction.objectStore(IDBFS.DB_STORE_NAME);
} catch (err) {
return callback(err);
}
transaction.onerror = function(e) { transaction.onerror = function(e) {
callback(this.error); callback(this.error);