Merge branch 'master' into devel

Conflicts:
	Makefile.am
	configure.ac
	deadbeef.h
	main.c
	plugins/oss/Makefile.am
	plugins/oss/oss.c

1 files changed, 4 insertions, 1 deletions

diff --git a/streamer.c b/streamer.c
index 38371b77..a196e33a 100644
--- a/streamer.c
+++ b/streamer.c
@@ -308,7 +308,10 @@ streamer_thread (void *ctx) {
             else if (pstate == 1) {
                 last_bitrate = -1;
                 avg_bitrate = -1;
-                p_play ();
+                if (p_play () < 0) {
+                    fprintf (stderr, "streamer: failed to start playback; output plugin doesn't work\n");
+                    streamer_set_nextsong (-2, 0);
+                }
             }
             else if (pstate == 2) {
                 p_pause ();