Merge branch 'refs/heads/develop' into desktop

This commit is contained in:
Ruud committed 2012-05-09 22:20:53 +02:00
commit 5be9dc0b4a
1 file changed
+1 -3
+1 -3
View File
@@ -45,7 +45,7 @@ class Renamer(Plugin):
return return
if self.renaming_started is True: if self.renaming_started is True:
log.error('Renamer is disabled to avoid infinite looping of the same error.') log.info('Renamer is disabled to avoid infinite looping of the same error.')
return return
# Check to see if the "to" folder is inside the "from" folder. # Check to see if the "to" folder is inside the "from" folder.
@@ -322,8 +322,6 @@ class Renamer(Plugin):
elif not remove_leftovers: # Don't remove anything elif not remove_leftovers: # Don't remove anything
remove_files = [] remove_files = []
continue
# Rename all files marked # Rename all files marked
group['renamed_files'] = [] group['renamed_files'] = []
for src in rename_files: for src in rename_files: