From 9dbed4d2e67862cd323e9009f38c66677f5ac823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Sun, 13 May 2007 13:04:24 +0200 Subject: [PATCH] Tagger.__rename_file: Set file.filename only after renaming the file, this should avoid KeyErrors on file/album removing if they was en error in renaming. --- picard/tagger.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/picard/tagger.py b/picard/tagger.py index 673016f6e..43aecb989 100644 --- a/picard/tagger.py +++ b/picard/tagger.py @@ -421,11 +421,12 @@ class Tagger(QtGui.QApplication): os.path.exists(encode_filename(new_filename + ext))): new_filename = "%s (%d)" % (tmp_filename, i) i += 1 - file.filename = new_filename + ext - self.log.debug("Moving file %r => %r", old_filename, file.filename) - shutil.move(encode_filename(old_filename), encode_filename(file.filename)) + new_filename = new_filename + ext + self.log.debug("Moving file %r => %r", old_filename, new_filename) + shutil.move(encode_filename(old_filename), encode_filename(new_filename)) + file.filename = new_filename del self.files[old_filename] - self.files[file.filename] = file + self.files[new_filename] = file return old_filename def __save_thread(self, files):