diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2024-10-23 14:10:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-10-31 12:52:00 -0400 |
commit | b30f05badca5fdad88faa7decb24efbfc9da9851 (patch) | |
tree | bbdf4db2a5a6d0b0ed5c888280ef6413906e1cc5 | |
parent | e829ea9a5ea05c6dedd91f741f91cb8723e50b19 (diff) | |
download | rockbox-b30f05badc.tar.gz rockbox-b30f05badc.zip |
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
-rw-r--r-- | apps/plugin.c | 4 | ||||
-rw-r--r-- | apps/tagtree.c | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index f864a1d90b..adf207da79 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -882,6 +882,10 @@ int plugin_load(const char* plugin, const void* parameter) } } +#ifdef HAVE_DISK_STORAGE + if (!storage_disk_is_active()) + splash(0, ID2P(LANG_WAIT)); +#endif strcpy(current_plugin, plugin); current_plugin_handle = lc_open(plugin, pluginbuf, PLUGIN_BUFFER_SIZE); if (current_plugin_handle == NULL) { 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) { |