From 17e3856e13db3ed0ad5461c9fd962c93ebdc2eb3 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:06:51 +0100 Subject: [PATCH] MainForm - Fix model selector ignoring cancel button --- PCK-Studio/MainForm.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 74066f7c..dd2ef1db 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -560,11 +560,12 @@ namespace PckStudio using ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(modelNames.ToArray()); itemSelectionPopUp.ButtonText = "View"; itemSelectionPopUp.LabelText = "Models:"; - if (itemSelectionPopUp.ShowDialog() == DialogResult.OK && modelNames.IndexInRange(itemSelectionPopUp.SelectedIndex)) + if (itemSelectionPopUp.ShowDialog() != DialogResult.OK || !modelNames.IndexInRange(itemSelectionPopUp.SelectedIndex)) { + return; + } modelName = modelNames[itemSelectionPopUp.SelectedIndex]; } - } NamedTexture modelTexture = new NamedTexture(Path.GetFileName(texturePath), asset.GetTexture());