Skip to content

Commit 4a996c5

Browse files
committed
fix: issue cancelling replace during save by move
1 parent 1b25dc6 commit 4a996c5

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/gui/src/IPC.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,9 +1476,14 @@ const ipc_listener = async (event, handled) => {
14761476
parent_uuid: $(el_filedialog_window).attr('data-element_uuid'),
14771477
});
14781478

1479-
await tell_caller_and_update_views({ res: node, el_filedialog_window, target_path });
1479+
if ( node ) {
1480+
await tell_caller_and_update_views({ res: node, el_filedialog_window, target_path });
1481+
if ( written ) return true;
1482+
} else {
1483+
await tell_caller_its_cancelled();
1484+
return true;
1485+
}
14801486

1481-
if ( written ) return true;
14821487
$(el_filedialog_window).find('.window-disable-mask, .busy-indicator').hide();
14831488
};
14841489

@@ -1500,23 +1505,19 @@ const ipc_listener = async (event, handled) => {
15001505
onSaveFileDialogSave: async function(target_path, el_filedialog_window){
15011506
$(el_filedialog_window).find('.window-disable-mask, .busy-indicator').show();
15021507
let busy_init_ts = Date.now();
1503-
let done;
15041508

15051509
if (event.data.url){
1506-
done = await handle_url_save({ target_path });
1510+
await handle_url_save({ target_path });
15071511
} else if ( event.data.source_path ) {
1508-
done = await handle_move_save({
1512+
await handle_move_save({
15091513
save_type: event.data.save_type,
15101514
source_path: event.data.source_path,
15111515
target_path,
15121516
});
15131517
} else {
1514-
done = await handle_data_save({ target_path, el_filedialog_window });
1518+
await handle_data_save({ target_path, el_filedialog_window });
15151519
}
15161520

1517-
if ( ! done ) return;
1518-
1519-
// done
15201521
let busy_duration = (Date.now() - busy_init_ts);
15211522
if( busy_duration >= window.busy_indicator_hide_delay){
15221523
$(el_filedialog_window).close();

0 commit comments

Comments
 (0)