diff options
author | William Pitcock <nenolod@dereferenced.org> | 2011-02-04 19:14:07 -0600 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2011-02-04 19:14:07 -0600 |
commit | d8bb6d69c0ed8f24f8b751f2ee564ca8e682d3e7 (patch) | |
tree | 8e457f524b2ed6dec611c5a09f9882e8aba353d7 /main/audacious/audacious-2.4.3-playlist-AUD-285.patch | |
parent | 1a77b98f2894afe0fe51c8e5d9d1b44a71016b13 (diff) | |
download | aports-d8bb6d69c0ed8f24f8b751f2ee564ca8e682d3e7.tar.bz2 aports-d8bb6d69c0ed8f24f8b751f2ee564ca8e682d3e7.tar.xz |
main/audacious: merge in memory leak patches for upstream AUD-285 and AUD-286
Diffstat (limited to 'main/audacious/audacious-2.4.3-playlist-AUD-285.patch')
-rw-r--r-- | main/audacious/audacious-2.4.3-playlist-AUD-285.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/main/audacious/audacious-2.4.3-playlist-AUD-285.patch b/main/audacious/audacious-2.4.3-playlist-AUD-285.patch new file mode 100644 index 0000000000..b0b620dd20 --- /dev/null +++ b/main/audacious/audacious-2.4.3-playlist-AUD-285.patch @@ -0,0 +1,22 @@ +diff -Nur audacious-2.4.3-orig/src/audacious/playlist-new.c audacious-2.4.3/src/audacious/playlist-new.c +--- audacious-2.4.3-orig/src/audacious/playlist-new.c 2011-01-12 12:07:37.000000000 +0100 ++++ audacious-2.4.3/src/audacious/playlist-new.c 2011-01-28 23:28:26.557658545 +0100 +@@ -1846,14 +1846,14 @@ + if (entries == 0) + return FALSE; + +- if (playlist->position != NULL && playlist->position->queued) ++ /* If we have a song in queue, jump to it, _then_ remove it from queue */ ++ if (playlist->queued != NULL) + { ++ set_position (playlist, playlist->queued->data); ++ + playlist->queued = g_list_remove(playlist->queued, playlist->position); + playlist->position->queued = FALSE; + } +- +- if (playlist->queued != NULL) +- set_position (playlist, playlist->queued->data); + else if (cfg.shuffle) + { + if (! shuffle_next (playlist)) |