tagfile wchar fix.

2026-06-09 08:41:33 +02:00
parent 6ed566c6cd
commit 091664044c
1 changed files with 9 additions and 14 deletions
@@ -137,20 +137,15 @@
    (make-tags-picture mimetype kind bm #:description description))

  (define (open-tag-file file)
-    (let ((tag-file (taglib_file_new file)))
-      (if (and tag-file (taglib_file_is_valid tag-file))
-          tag-file
-          (begin
-            (when (and tag-file (not (eq? tag-file #f))) (taglib_file_free tag-file))
-            (if (eq? (system-type 'os) 'windows)
-                (begin
-                  (dbg-sound "Could not open file ~a, trying wchar version on windows" file)
-                  (let ((wtag-file (taglib_file_new_wchar file)))
-                    (if (and wtag-file (taglib_file_is_valid wtag-file)) wtag-file
-                        (begin
-                          (when (and wtag-file (not (eq? wtag-file #f))) (taglib_file_free wtag-file))
-                          #f))))
-                #f)))))
+    (if (eq? (system-type 'os) 'windows)
+        (let ((tag-file (taglib_file_new_wchar file)))
+          (if (and tag-file (taglib_file_is_valid tag-file))
+              tag-file
+              #f))
+        (let ((tag-file (taglib_file_new file)))
+          (if (and tag-file (taglib_file_is_valid tag-file))
+              tag-file
+              #f))))

  (define (read-property-map tag-file)
    (define key-store (make-hash))