From 9ba850ae6ca1171248aa41a2b1f772b8cb257fbb Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <wfeldt@opensuse.org>
Date: Fri, 28 Feb 2020 15:07:34 +0100
Subject: [PATCH] adjust code

---
 src/lib/bootloader/proposal_client.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/lib/bootloader/proposal_client.rb b/src/lib/bootloader/proposal_client.rb
index 592d14836..9e1990eb5 100644
--- a/src/lib/bootloader/proposal_client.rb
+++ b/src/lib/bootloader/proposal_client.rb
@@ -342,12 +342,18 @@ def handle_errors(ret)
     end
 
     def single_click_action(option, value)
-      stage1 = ::Bootloader::BootloaderFactory.current.stage1
+      bootloader = ::Bootloader::BootloaderFactory.current
+
+      log.info "single_click_action: option #{option}, value #{value.inspect}"
+
       case option
-      when "boot_mbr"
-        devices = stage1.boot_disk_names
-      when "boot_boot"
-        devices = stage1.boot_partition_names
+      when "boot_mbr", "boot_boot"
+        stage1 = bootloader.stage1
+        devices = (option == "boot_mbr") ? stage1.boot_disk_names : stage1.boot_partition_names
+        log.info "single_click_action: devices #{devices}"
+        devices.each do |device|
+          value ? stage1.add_udev_device(device) : stage1.remove_device(device)
+        end
       when "trusted_boot"
         ::Bootloader::BootloaderFactory.current.trusted_boot = value
       when "secure_boot"
@@ -362,11 +368,6 @@ def single_click_action(option, value)
           )
         end
       end
-      log.info "single_click_action #{option} #{value.inspect} #{devices}"
-
-      devices&.each do |device|
-        value ? stage1.add_udev_device(device) : stage1.remove_device(device)
-      end
 
       Yast::Bootloader.proposed_cfg_changed = true
     end