From 8a0b18c9608755e7640856eeab75c5b687921c36 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Tue, 15 Mar 2016 23:06:10 -0400
Subject: [PATCH] Fix #1903: scrub sometimes ignored id3v23

---
 beetsplug/scrub.py | 3 ++-
 docs/changelog.rst | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/beetsplug/scrub.py b/beetsplug/scrub.py
index 1c842f2343..66815ee313 100644
--- a/beetsplug/scrub.py
+++ b/beetsplug/scrub.py
@@ -133,7 +133,8 @@ def _scrub_item(self, item, restore=True):
             item.try_write()
             if art:
                 self._log.debug(u'restoring art')
-                mf = mediafile.MediaFile(util.syspath(item.path))
+                mf = mediafile.MediaFile(util.syspath(item.path),
+                                         config['id3v23'].get(bool))
                 mf.art = art
                 mf.save()
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4063b0fa43..22d2c72263 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,6 +16,8 @@ Fixes:
 * Fix a crash when iTunes Sound Check tags contained invalid data. :bug:`1895`
 * :doc:`/plugins/mbcollection`: The plugin now redacts your MusicBrainz
   password in the ``beet config`` output. :bug:`1907`
+* :doc:`/plugins/scrub`: Fix an occasional problem where scrubbing on import
+  could undo the ``id3v23`` setting. :bug:`1903`
 
 
 1.3.17 (February 7, 2016)