From b30f05badca5fdad88faa7decb24efbfc9da9851 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Wed, 23 Oct 2024 14:10:31 -0400 Subject: Revert "plugin load / tagtree retrieval: eliminate storage_disk_is_active check" ata_disk_is_active() behavior with SSDs has reverted, so we want to keep this. This reverts commit ef19fa4408ed48e29fa3307af0b288efa61c4901. Change-Id: I29f08617285747c17a52352bd7bba4069e71cde6 --- apps/tagtree.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'apps/tagtree.c') diff --git a/apps/tagtree.c b/apps/tagtree.c index 6b93b36561..83bfb4e36d 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c @@ -1465,8 +1465,18 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init) int sort_limit; int strip; - /* Show search progress after 0.5s delay */ - show_search_progress(true, 0, 0, 0); + /* Show search progress straight away if the disk needs to spin up, + otherwise show it after the normal 1/2 second delay */ + show_search_progress( +#ifdef HAVE_DISK_STORAGE +#ifdef HAVE_TC_RAMCACHE + tagcache_is_in_ram() ? true : +#endif + storage_disk_is_active() +#else + true +#endif + , 0, 0, 0); if (c->currtable == TABLE_ALLSUBENTRIES) { -- cgit v1.2.3