From 5ce996df0db8e2dc2fc4b4a85abbab0cd0d5257d Mon Sep 17 00:00:00 2001 From: Tai Lee Date: Thu, 6 Jun 2013 10:18:01 +1000 Subject: [PATCH] Revert "Don't bypass candidate selection in timid mode. Always show all candidates." This reverts commit b02974f68f8e71d526aec16da5c1f74eaa48c7e9. --- beets/ui/commands.py | 2 +- docs/changelog.rst | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 96e67cde2..dfe3585c1 100644 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -466,7 +466,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None, # Is the change good enough? bypass_candidates = False - if rec != recommendation.none and not config['import']['timid']: + if rec != recommendation.none: match = candidates[0] bypass_candidates = True diff --git a/docs/changelog.rst b/docs/changelog.rst index 362bbd5b3..1daa09ef3 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -72,7 +72,6 @@ Changelog together for better readability. * Don't show potential matches that have specific penalties applied, as configured by the :ref:`ignored` setting. - * Don't bypass candidate selection in timid mode. Always show all candidates. * Improve calculation of similarity score and recommendation: