mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

patch fix for 3825

Browse source
This commit is contained in:
John McLear 2020-04-03 10:30:12 +00:00
parent 0889a1313d
commit 4e212d12b2
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/node/handler/ImportHandler.js
View file

@ -83,7 +83,11 @@ async function doImport(req, res, padId)
} }
reject("uploadFailed"); reject("uploadFailed");
} }
if(!files.file){ // might not be a graceful fix but it works
reject("uploadFailed");
}else{
resolve(files.file.path); resolve(files.file.path);
}
}); });
}); });
@ -148,6 +152,9 @@ async function doImport(req, res, padId)
} else { } else {
// @TODO - no Promise interface for convertors (yet) // @TODO - no Promise interface for convertors (yet)
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
// Why are we running convertFile if it's been rejected?
console.warn("john debug", reject);
convertor.convertFile(srcFile, destFile, exportExtension, function(err) { convertor.convertFile(srcFile, destFile, exportExtension, function(err) {
// catch convert errors // catch convert errors
if (err) { if (err) {