Author: juhliarik Date: Thu Apr 16 17:20:53 2009 New Revision: 56824 URL: http://svn.opensuse.org/viewcvs/yast?rev=56824&view=rev Log: added fix for problem with updating boot loader type if changing of bootloader is cancelled Modified: trunk/bootloader/src/routines/global_widgets.ycp trunk/bootloader/src/routines/popups.ycp Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_widgets.ycp?rev=56824&r1=56823&r2=56824&view=diff ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Thu Apr 16 17:20:53 2009 @@ -321,7 +321,10 @@ ELILO supports only the EFI boot architecture. If yor firmware does not support it, your computer will not boot."))) + { + UI::ChangeWidget (`id ("loader_type"), `Value, Bootloader::getLoaderType ()); return nil; + } } else if (old_bl == "elilo") { // continue/cancel pop-up @@ -329,7 +332,10 @@ Bootloader you selected does not support the EFI boot architecture. If your firmware does not support legacy booting, your computer will not boot."))) + { + UI::ChangeWidget (`id ("loader_type"), `Value, Bootloader::getLoaderType ()); return nil; + } } } @@ -385,7 +391,10 @@ symbol action = (symbol)UI::QueryWidget (`id (`action), `CurrentButton); UI::CloseDialog (); if (ret != `ok) + { + UI::ChangeWidget (`id ("loader_type"), `Value, Bootloader::getLoaderType ()); return nil; + } if (nil != action) { Modified: trunk/bootloader/src/routines/popups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/popups.ycp?rev=56824&r1=56823&r2=56824&view=diff ============================================================================== --- trunk/bootloader/src/routines/popups.ycp (original) +++ trunk/bootloader/src/routines/popups.ycp Thu Apr 16 17:20:53 2009 @@ -143,7 +143,7 @@ * @param string reason text stating why the location should be re-proposed * @return boolean yes if shall be reset */ - boolean askLocationResetPopup (string reason) ``{ + global boolean askLocationResetPopup (string reason) ``{ // yes-no popup return Popup::YesNo(sformat(_("%1Set default boot loader location? "), reason)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org