From 9b89b576b3f470aed29c8d1bc9d51bdc52f143b4 Mon Sep 17 00:00:00 2001
From: gc <gc>
Date: Sat, 4 Feb 2006 17:39:11 +0000
Subject: [PATCH] be sure that opening properties doesnt destroy some theme
 choices

---
 bin/booh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/bin/booh b/bin/booh
index 4d758f2..7595de0 100755
--- a/bin/booh
+++ b/bin/booh
@@ -2703,6 +2703,13 @@ def populate_subalbums_treeview(select_first)
     end
 end
 
+def select_current_theme
+    select_theme($xmldoc.root.attributes['theme'],
+                 $xmldoc.root.attributes['limit-sizes'],
+                 !$xmldoc.root.attributes['optimize-for-32'].nil?,
+                 $xmldoc.root.attributes['thumbnails-per-row'])
+end
+
 def open_file(filename)
 
     $filename = nil
@@ -2780,12 +2787,9 @@ def open_file(filename)
         $xmldoc.root.add_attribute('version', $VERSION)
     end
 
-    limit_sizes = $xmldoc.root.attributes['limit-sizes']
-    optimizefor32 = !$xmldoc.root.attributes['optimize-for-32'].nil?
-    nperrow = $xmldoc.root.attributes['thumbnails-per-row']
+    select_current_theme
 
     $filename = filename
-    select_theme(theme, limit_sizes, optimizefor32, nperrow)
     $default_size['thumbnails'] =~ /(.*)x(.*)/
     $default_thumbnails = { :x => $1.to_i, :y => $2.to_i }
     $albums_thumbnail_size =~ /(.*)x(.*)/
@@ -3293,6 +3297,9 @@ def properties
                              open_file($filename)
                              $modified = true
                          } })
+    else
+        #- select_theme merges global variables, need to return to current choices
+        select_current_theme
     end
 end
 
-- 
2.30.4