Merge pull request #1310 from yast/close_progress_popups_sp6

yast · May 7, 2024 · c502bba · c502bba
2 parents 05aae46 + 202a352
commit c502bba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/library/packages/src/modules/PackageCallbacks.rb b/library/packages/src/modules/PackageCallbacks.rb
@@ -2397,7 +2397,7 @@ def ProgressEnd(id)
       )
 
       if !Mode.commandline && IsProgressPopup()
-        UI.CloseDialog if Builtins.size(@progress_stack) == 0
+        UI.CloseDialog if Builtins.size(@progress_stack) >= 0
       elsif full_screen
         if Ops.greater_than(Builtins.size(@progress_stack), 0)
           progress_type = Ops.get_symbol(

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May  6 13:08:32 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Properly close nested progress callbacks (bsc#1223281)
+- 4.6.8
+
 -------------------------------------------------------------------
 Wed Feb 21 11:07:25 UTC 2024 - Michal Filka <mfilka@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.6.7
+Version:        4.6.8
 
 Release:        0
 Summary:        YaST2 Main Package