Don't pass driver.menu to menu_database_realloc

This commit is contained in:
twinaphex 2015-02-13 19:46:07 +01:00
parent 4bc117222b
commit 6a68b56e71
3 changed files with 7 additions and 3 deletions

View File

@ -54,9 +54,13 @@ void menu_database_free(menu_handle_t *menu)
menu_database_playlist_free(menu); menu_database_playlist_free(menu);
} }
bool menu_database_realloc(menu_handle_t *menu, const char *path, bool menu_database_realloc(const char *path,
bool force) bool force)
{ {
menu_handle_t *menu = menu_driver_resolve();
if (!menu)
return false;
if (!strcmp(menu->db_playlist_file, path) && !force) if (!strcmp(menu->db_playlist_file, path) && !force)
return true; return true;

View File

@ -32,7 +32,7 @@ int menu_database_populate_query(file_list_t *list, const char *path,
void menu_database_free(menu_handle_t *menu); void menu_database_free(menu_handle_t *menu);
bool menu_database_realloc(menu_handle_t *menu, const char *path, bool menu_database_realloc(const char *path,
bool force); bool force);
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -1003,7 +1003,7 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata,
fill_pathname_join(path_rdl, g_settings.content_database, path_base, fill_pathname_join(path_rdl, g_settings.content_database, path_base,
sizeof(path_rdl)); sizeof(path_rdl));
menu_database_realloc(driver.menu, path_rdl, false); menu_database_realloc(path_rdl, false);
playlist = menu->db_playlist; playlist = menu->db_playlist;