From 6129bfbb95bc62836de461f1e792ac0316659617 Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Sun, 15 Jan 2023 13:35:32 +0100 Subject: PictureFlow: Eliminate 'prompt' launch parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was added in commit d553bb1 and doesn’t seem to be used anymore. Return PLUGIN_OK since an error message is already produced. Change-Id: I5eaf7e7eb7c850a6fa9c3d2717c440e335f5efd1 --- apps/plugins/pictureflow/pictureflow.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index b2cf467a2f..b231390420 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -652,7 +652,7 @@ static inline void buf_ctx_unlock(void) buf_ctx_locked = false; } -static bool check_database(bool prompt) +static bool check_database(void) { bool needwarn = true; int spin = 5; @@ -670,9 +670,7 @@ static bool check_database(bool prompt) needwarn = false; rb->splash(0, ID2P(LANG_TAGCACHE_BUSY)); } - else if (!prompt) - return false; - else if (rb->action_userabort(HZ/5)) + else return false; rb->yield(); @@ -4952,17 +4950,12 @@ enum plugin_status plugin_start(const void *parameter) void * buf; size_t buf_size; - bool prompt = (parameter && (((char *) parameter)[0] == ACTIVITY_MAINMENU)); bool file_id3 = (parameter && (((char *) parameter)[0] == '/')); - if (!check_database(prompt)) + if (!check_database()) { - if (prompt) - return PLUGIN_OK; - else - error_wait("Please enable database"); - - return PLUGIN_ERROR; + error_wait("Please enable database"); + return PLUGIN_OK; } atexit(cleanup); -- cgit v1.2.3