Merge branch 'master' into gapless

2 files changed, 11 insertions, 7 deletions

diff --git a/gtkplaylist.c b/gtkplaylist.c
index a25c1bb3..0c39cde9 100644
--- a/gtkplaylist.c
+++ b/gtkplaylist.c
@@ -685,6 +685,10 @@ gtkpl_scroll (gtkplaylist_t *ps, int newscroll) {
                 }
             }
         }
+        else {
+            ps->scrollpos = newscroll;
+            gtkpl_draw_playlist (ps, 0, 0, widget->allocation.width, widget->allocation.height);
+        }
         gdk_draw_drawable (widget->window, widget->style->black_gc, ps->backbuf, 0, 0, 0, 0, widget->allocation.width, widget->allocation.height);
     }
 }
diff --git a/playlist.c b/playlist.c
index 14ccd2cd..f99958a1 100644
--- a/playlist.c
+++ b/playlist.c
@@ -213,13 +213,13 @@ pl_process_cue_track (playItem_t *after, const char *fname, playItem_t **prev, c
 
 playItem_t *
 pl_insert_cue_from_buffer (playItem_t *after, const char *fname, const uint8_t *buffer, int buffersize, struct DB_decoder_s *decoder, const char *ftype, float duration) {
-    char performer[256];
-    char albumtitle[256];
-    char track[256];
-    char title[256];
-    char pregap[256];
-    char index00[256];
-    char index01[256];
+    char performer[256] = "";
+    char albumtitle[256] = "";
+    char track[256] = "";
+    char title[256] = "";
+    char pregap[256] = "";
+    char index00[256] = "";
+    char index01[256] = "";
     playItem_t *prev = NULL;
     while (buffersize > 0) {
         const uint8_t *p = buffer;