Fix missed wizard dialog for #WriteDialog

yast · Aug 9, 2018 · 75121bb · 75121bb
1 parent 94aea8f
commit 75121bb
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/include/squid/complex.rb b/src/include/squid/complex.rb
@@ -330,20 +330,23 @@ def ReadDialog
     end
 
     # Write settings dialog
-    # @return `abort if aborted and `next otherwise
+    #
+    # @return [Symbol] :abort if aborted, :next otherwise
     def WriteDialog
-      Wizard.RestoreHelp(Ops.get_string(@HELPS, "write", ""))
+      help = @HELPS.fetch("write") { "" }
+
+      Wizard.CreateDialog
+      Wizard.RestoreHelp(help)
       Squid.AbortFunction = fun_ref(method(:PollAbort), "boolean ()")
-      ret = Squid.Write
-      ret ? :next : :abort
+      result = Squid.Write
+      Wizard.CloseDialog
+
+      return :next if result
+      :abort
     end
 
     def SaveAndRestart
-      Wizard.CreateDialog
       WriteDialog()
-      UI.CloseDialog
-
-      nil
     end
 
     def MainDialog