Skip to content

Commit e42ba35

Browse files
committed
"Cancel bug" fix #188
1 parent d5c760e commit e42ba35

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

src/main.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,17 @@ export default class MediaDbPlugin extends Plugin {
218218
(await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => {
219219
return await this.queryDetails(selectModalData.selected);
220220
})) ?? [];
221-
if (!selectResults) {
221+
if (!selectResults || selectResults.length < 1) {
222222
return;
223223
}
224224

225-
proceed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
225+
const confirmed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
226226
return previewModalData.confirmed;
227227
});
228+
if (!confirmed) {
229+
return;
230+
}
231+
break;
228232
}
229233

230234
await this.createMediaDbNotes(selectResults!);
@@ -248,13 +252,17 @@ export default class MediaDbPlugin extends Plugin {
248252
(await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => {
249253
return await this.queryDetails(selectModalData.selected);
250254
})) ?? [];
251-
if (!selectResults) {
255+
if (!selectResults || selectResults.length < 1) {
252256
return;
253257
}
254258

255-
proceed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
259+
const confirmed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
256260
return previewModalData.confirmed;
257261
});
262+
if (!confirmed) {
263+
return;
264+
}
265+
break;
258266
}
259267

260268
await this.createMediaDbNotes(selectResults!);

src/utils/ModalHelper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,12 +505,12 @@ export class ModalHelper {
505505
console.warn(previewModalResult.error);
506506
new Notice(previewModalResult.error.toString());
507507
previewModal.close();
508-
return true;
508+
return false;
509509
}
510510

511511
if (previewModalResult.code === ModalResultCode.CLOSE) {
512512
// modal is already being closed
513-
return true;
513+
return false;
514514
}
515515

516516
try {

0 commit comments

Comments
 (0)