diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 17 |
1 files 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) | |||
652 | buf_ctx_locked = false; | 652 | buf_ctx_locked = false; |
653 | } | 653 | } |
654 | 654 | ||
655 | static bool check_database(bool prompt) | 655 | static bool check_database(void) |
656 | { | 656 | { |
657 | bool needwarn = true; | 657 | bool needwarn = true; |
658 | int spin = 5; | 658 | int spin = 5; |
@@ -670,9 +670,7 @@ static bool check_database(bool prompt) | |||
670 | needwarn = false; | 670 | needwarn = false; |
671 | rb->splash(0, ID2P(LANG_TAGCACHE_BUSY)); | 671 | rb->splash(0, ID2P(LANG_TAGCACHE_BUSY)); |
672 | } | 672 | } |
673 | else if (!prompt) | 673 | else |
674 | return false; | ||
675 | else if (rb->action_userabort(HZ/5)) | ||
676 | return false; | 674 | return false; |
677 | 675 | ||
678 | rb->yield(); | 676 | rb->yield(); |
@@ -4952,17 +4950,12 @@ enum plugin_status plugin_start(const void *parameter) | |||
4952 | 4950 | ||
4953 | void * buf; | 4951 | void * buf; |
4954 | size_t buf_size; | 4952 | size_t buf_size; |
4955 | bool prompt = (parameter && (((char *) parameter)[0] == ACTIVITY_MAINMENU)); | ||
4956 | bool file_id3 = (parameter && (((char *) parameter)[0] == '/')); | 4953 | bool file_id3 = (parameter && (((char *) parameter)[0] == '/')); |
4957 | 4954 | ||
4958 | if (!check_database(prompt)) | 4955 | if (!check_database()) |
4959 | { | 4956 | { |
4960 | if (prompt) | 4957 | error_wait("Please enable database"); |
4961 | return PLUGIN_OK; | 4958 | return PLUGIN_OK; |
4962 | else | ||
4963 | error_wait("Please enable database"); | ||
4964 | |||
4965 | return PLUGIN_ERROR; | ||
4966 | } | 4959 | } |
4967 | 4960 | ||
4968 | atexit(cleanup); | 4961 | atexit(cleanup); |