summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-08-17 11:27:33 +0000
committerThomas Martitz <kugel@rockbox.org>2011-08-17 11:27:33 +0000
commit1da1b70e269b16d381c892fb7003ec5526471b60 (patch)
tree59cbb259a6f2e86a67df798f655b706a880dff7a /apps
parent480f9b8bf9efa137980777e2f3a4f1d04a288701 (diff)
downloadrockbox-1da1b70e269b16d381c892fb7003ec5526471b60.tar.gz
rockbox-1da1b70e269b16d381c892fb7003ec5526471b60.zip
Fix panic after usb extraction if lastfm logging is enabled.
Previously the scrobbler was shutdown, probably to force a log flush, and the cache was re-allocated afterwards. Now don't shut down or re-allocate, but instead rely on the ata idle callback which is called called on usb insertion to do the log flush. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30325 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/misc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/misc.c b/apps/misc.c
index d74fe73205..69c62da238 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -239,7 +239,6 @@ bool settings_parseline(char* line, char** name, char** value)
239 239
240static void system_flush(void) 240static void system_flush(void)
241{ 241{
242 scrobbler_shutdown();
243 playlist_shutdown(); 242 playlist_shutdown();
244 tree_flush(); 243 tree_flush();
245 call_storage_idle_notifys(true); /*doesnt work on usb and shutdown from ata thread */ 244 call_storage_idle_notifys(true); /*doesnt work on usb and shutdown from ata thread */
@@ -248,7 +247,6 @@ static void system_flush(void)
248static void system_restore(void) 247static void system_restore(void)
249{ 248{
250 tree_restore(); 249 tree_restore();
251 scrobbler_init();
252} 250}
253 251
254static bool clean_shutdown(void (*callback)(void *), void *parameter) 252static bool clean_shutdown(void (*callback)(void *), void *parameter)