Merge branch 'master' into upload-logs
This commit is contained in:
commit
8a3e21d007
|
@ -113,7 +113,7 @@ export default function Upload(props: Props) {
|
|||
props.setFiles
|
||||
);
|
||||
|
||||
if (isElectron()) {
|
||||
if (isElectron() && ImportService.checkAllElectronAPIsExists()) {
|
||||
ImportService.getPendingUploads().then(
|
||||
({ files: electronFiles, collectionName, type }) => {
|
||||
resumeDesktopUpload(type, electronFiles, collectionName);
|
||||
|
|
|
@ -363,7 +363,7 @@ class UploadManager {
|
|||
`failed to do post file upload action -> ${e.message}
|
||||
${(e as Error).stack}`
|
||||
);
|
||||
// shallow errors as we don't want to break complete upload
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue