From 2f2e836a2657a2863cc50a6698bbc3cefd78c69b Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Mon, 18 Dec 2000 17:40:16 +0000 Subject: fix "cancel" sillyness in choosing cdrom device dialog --- mdk-stage1/cdrom.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index 14ece3c04..2188ddcc7 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -114,10 +114,14 @@ enum return_type cdrom_prepare(void) unset_param(MODE_AUTOMATIC); return results; } - else + else { results = ask_from_list_comments("Please choose the CDROM drive to use for the installation.", medias, medias_models, &choice); - - results = try_with_device(choice); + if (results == RETURN_OK) + results = try_with_device(choice); + else + return results; + } + if (results == RETURN_OK) return RETURN_OK; if (results == RETURN_BACK) -- cgit v1.2.1