From e42ba35697cfadb508718ecaca44954991c2de39 Mon Sep 17 00:00:00 2001
From: ltctceplrm <14954927+ltctceplrm@users.noreply.github.com>
Date: Mon, 5 May 2025 15:52:16 +0200
Subject: [PATCH] "Cancel bug" fix #188

---
 src/main.ts              | 16 ++++++++++++----
 src/utils/ModalHelper.ts |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index bdb02bb..c4f8562 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -218,13 +218,17 @@ export default class MediaDbPlugin extends Plugin {
 				(await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => {
 					return await this.queryDetails(selectModalData.selected);
 				})) ?? [];
-			if (!selectResults) {
+			if (!selectResults || selectResults.length < 1) {
 				return;
 			}
 
-			proceed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
+			const confirmed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
 				return previewModalData.confirmed;
 			});
+			if (!confirmed) {
+				return;
+			}
+			break;
 		}
 
 		await this.createMediaDbNotes(selectResults!);
@@ -248,13 +252,17 @@ export default class MediaDbPlugin extends Plugin {
 				(await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => {
 					return await this.queryDetails(selectModalData.selected);
 				})) ?? [];
-			if (!selectResults) {
+			if (!selectResults || selectResults.length < 1) {
 				return;
 			}
 
-			proceed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
+			const confirmed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => {
 				return previewModalData.confirmed;
 			});
+			if (!confirmed) {
+				return;
+			}
+			break;
 		}
 
 		await this.createMediaDbNotes(selectResults!);
diff --git a/src/utils/ModalHelper.ts b/src/utils/ModalHelper.ts
index eadf5a2..fce0f5c 100644
--- a/src/utils/ModalHelper.ts
+++ b/src/utils/ModalHelper.ts
@@ -505,12 +505,12 @@ export class ModalHelper {
 			console.warn(previewModalResult.error);
 			new Notice(previewModalResult.error.toString());
 			previewModal.close();
-			return true;
+			return false;
 		}
 
 		if (previewModalResult.code === ModalResultCode.CLOSE) {
 			// modal is already being closed
-			return true;
+			return false;
 		}
 
 		try {