summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <waker@users.sourceforge.net>2014-07-08 20:30:07 +0200
committerGravatar Alexey Yakovenko <waker@users.sourceforge.net>2014-07-08 20:30:07 +0200
commitfaffc4a53ba096d8aea3f1c729b9251ce6dba9d0 (patch)
tree7084b1ef652b344e284231d0c259526c9a4c1d12 /main.c
parentb7a1a240765b1b87bd2c0ac05afd7c6bfe83bc37 (diff)
fixed unpausing of currently paused track using "play" action
Diffstat (limited to 'main.c')
-rw-r--r--main.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/main.c b/main.c
index 8cc3e63a..dbaed838 100644
--- a/main.c
+++ b/main.c
@@ -344,7 +344,7 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
plt_add_files_end (curr_plt, 0);
plt_unref (curr_plt);
if (!queue) {
- messagepump_push (DB_EV_PLAY_CURRENT, 0, 1, 0);
+ messagepump_push (DB_EV_PLAY_NUM, 0, 0, 0);
return 2; // don't reload playlist at startup
}
}
@@ -571,14 +571,7 @@ player_mainloop (void) {
}
break;
case DB_EV_PLAY_CURRENT:
- if (p1) {
- output->stop ();
- pl_playqueue_clear ();
- streamer_set_nextsong (0, 1);
- }
- else {
- streamer_play_current_track ();
- }
+ streamer_play_current_track ();
break;
case DB_EV_PLAY_NUM:
output->stop ();