tagfile wchar fix.

2026-06-09 08:42:29 +02:00
parent 091664044c
commit f8214b8f1b
1 changed files with 11 additions and 9 deletions
@@ -137,15 +137,17 @@
    (make-tags-picture mimetype kind bm #:description description))
  (define (open-tag-file file)
-    (if (eq? (system-type 'os) 'windows)
+    (let ((tag-file (if (eq? (system-type 'os) 'windows)
-        (let ((tag-file (taglib_file_new_wchar file)))
+                        (taglib_file_new_wchar file)
-          (if (and tag-file (taglib_file_is_valid tag-file))
+                        (taglib_file_new file))))
-              tag-file
+      (cond
-              #f))
+        ((eq? tag-file #f) #f)
-        (let ((tag-file (taglib_file_new file)))
+        ((taglib_file_is_valid tag-file) tag-file)
-          (if (and tag-file (taglib_file_is_valid tag-file))
+        (else
-              tag-file
+         (taglib_file_free tag-file)
-              #f))))
+         #f))
      )
    )
  (define (read-property-map tag-file)
    (define key-store (make-hash))