imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9352 from vector-im/travis/save-as-2

Browse source 
Don't try to save files the user didn't want to save
This commit is contained in:
Travis Ralston 2019-04-02 07:33:36 -06:00 • committed by GitHub
commit 958260d559
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
electron_app/src/webcontents-handler.js
View file

@ -96,13 +96,14 @@ function onLinkContextMenu(ev, params) {
defaultPath: targetFileName, defaultPath: targetFileName,
}); });
if (!filePath) return; // user cancelled dialog
try { try {
if (url.startsWith("data:")) { if (url.startsWith("data:")) {
fs.writeFileSync(filePath, nativeImage.createFromDataURL(url)); fs.writeFileSync(filePath, nativeImage.createFromDataURL(url));
} else { } else {
request.get(url).pipe(fs.createWriteStream(filePath)); request.get(url).pipe(fs.createWriteStream(filePath));
} }
} catch (err) { } catch (err) {
console.error(err); console.error(err);
dialog.showMessageBox({ dialog.showMessageBox({