scratchfoundation/scratch-desktop
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-desktop.git synced 2025-01-09 14:12:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix save & quit dialogs for Electron 6 API changes

Browse source
This commit is contained in:
Christopher Willis-Ford 2020-01-16 15:55:04 -08:00
parent 9b224115a5
commit 0b6652cde3
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/index.js
View file

@ -104,8 +104,11 @@ const createMainWindow = () => {
const extNameNoDot = extName.replace(/^\./, '');
options.filters = [getFilterForExtension(extNameNoDot)];
}
const userChosenPath = dialog.showSaveDialog(window, options);
const userChosenPath = dialog.showSaveDialogSync(window, options);
if (userChosenPath) {
// WARNING: `setSavePath` on this item is only valid during the `will-download` event. Calling the async
// version of `showSaveDialog` means the event will finish before we get here, so `setSavePath` will be
// ignored. For that reason we need to call `showSaveDialogSync` above.
item.setSavePath(userChosenPath);
if (isProjectSave) {
const newProjectTitle = path.basename(userChosenPath, extName);
@ -125,7 +128,7 @@ const createMainWindow = () => {
});
webContents.on('will-prevent-unload', ev => {
const choice = dialog.showMessageBox(window, {
const choice = dialog.showMessageBoxSync(window, {
type: 'question',
message: 'Leave Scratch?',
detail: 'Any unsaved changes will be lost.',