2 files changed, 10 insertions, 0 deletions
diff --git a/cmp3.c b/cmp3.c
index c8f90543..35bd033c 100644
--- a/cmp3.c
+++ b/cmp3.c
@@ -1608,6 +1608,15 @@ cmp3_insert (playItem_t *after, const char *fname) {
         break;
     }
 
+    playItem_t *cue_after = pl_insert_cue (after, fname, &cmp3, "mp3");
+    if (cue_after) {
+        cue_after->timeend = buffer.duration;
+        cue_after->duration = cue_after->timeend - cue_after->timestart;
+        pl_item_free (it);
+        fclose (fp);
+        return cue_after;
+    }
+
     after = pl_insert_item (after, it);
     fclose (fp);
     return after;
diff --git a/streamer.c b/streamer.c
index 7d6a31ac..b89717fd 100644
--- a/streamer.c
+++ b/streamer.c
@@ -83,6 +83,7 @@ streamer_thread (uintptr_t ctx) {
             codecleft = 0;
             codec_unlock ();
             pl_set_current (pl_get_for_idx (sng));
+            playpos = 0;
             if (pstate == 0) {
                 p_stop ();
             }