Merge pull request #847 from yast/bsc-1167248/restore-scroll-when-needed

[bsc#1167248] Restore scroll when needed
yast · Mar 20, 2020 · b47f0bc · b47f0bc
2 parents 71b5acc + 82e666d
commit b47f0bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 20 14:04:48 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- In the proposal runner, restore the scroll only when it was
+  previously saved (bsc#1167248).
+- 4.2.40
+
 -------------------------------------------------------------------
 Wed Mar 18 16:52:30 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.2.39
+Version:        4.2.40
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

diff --git a/src/lib/installation/proposal_runner.rb b/src/lib/installation/proposal_runner.rb
@@ -268,7 +268,10 @@ def save_vertical_scroll
       @proposal_vscroll = Yast::UI.QueryWidget(Id(:proposal), :VScrollValue)
     end
 
+    # Restores the vertical scroll if previously saved
     def restore_vertical_scroll
+      return unless @proposal_vscroll
+
       Yast::UI.ChangeWidget(Id(:proposal), :VScrollValue, @proposal_vscroll)
     end