do not call double close dialog when aborting (bnc#910343)

yast · Jul 9, 2015 · 752c6cf · 752c6cf
1 parent 51ab1c8
commit 752c6cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/include/bootloader/routines/dialogs.rb b/src/include/bootloader/routines/dialogs.rb
@@ -40,11 +40,7 @@ def initialize_bootloader_routines_dialogs(include_target)
     # @return true if abort was pressed
     def testAbort
       return false if Mode.commandline
-      if :abort == UI.PollInput
-        UI.CloseDialog if !Stage.initial
-        return true
-      end
-      false
+      return :abort == UI.PollInput
     end
 
     # Read settings dialog

diff --git a/src/include/bootloader/routines/wizards.rb b/src/include/bootloader/routines/wizards.rb
@@ -114,7 +114,7 @@ def BootloaderSequence
       )
       ret = Sequencer.Run(my_aliases, sequence)
 
-      UI.CloseDialog
+      Wizard.CloseDialog
       ret
     end
   end