diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-18 17:40:16 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-18 17:40:16 +0000 |
| commit | 2f2e836a2657a2863cc50a6698bbc3cefd78c69b (patch) | |
| tree | 60c49907d1aa9ceca7328cbdbf865e554182a4d8 /mdk-stage1/cdrom.c | |
| parent | fb696b6d16dbc4dd8a630eaac78dfdc5926336ba (diff) | |
| download | drakx-backup-do-not-use-2f2e836a2657a2863cc50a6698bbc3cefd78c69b.tar drakx-backup-do-not-use-2f2e836a2657a2863cc50a6698bbc3cefd78c69b.tar.gz drakx-backup-do-not-use-2f2e836a2657a2863cc50a6698bbc3cefd78c69b.tar.bz2 drakx-backup-do-not-use-2f2e836a2657a2863cc50a6698bbc3cefd78c69b.tar.xz drakx-backup-do-not-use-2f2e836a2657a2863cc50a6698bbc3cefd78c69b.zip | |
fix "cancel" sillyness in choosing cdrom device dialog
Diffstat (limited to 'mdk-stage1/cdrom.c')
| -rw-r--r-- | mdk-stage1/cdrom.c | 10 |
1 files 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) |