Merge branch 'master' into devel

Conflicts:
	plugins/alsa/alsa.c
	streamer.c

1 files changed, 9 insertions, 2 deletions

diff --git a/plugins.c b/plugins.c
index 230248e7..81aaf3d0 100644
--- a/plugins.c
+++ b/plugins.c
@@ -755,10 +755,17 @@ plug_reinit_sound (void) {
         fprintf (stderr, "failed to select output plugin %s\nreverted to %s\n", outplugname, prev->plugin.name);
         output_plugin = prev;
     }
-    p_init ();
+    streamer_reset (1);
+    if (p_init () < 0) {
+        streamer_set_nextsong (-2, 0);
+        return;
+    }
 
     if (state != OUTPUT_STATE_PAUSED && state != OUTPUT_STATE_STOPPED) {
-        p_play ();
+        if (p_play () < 0) {
+            fprintf (stderr, "failed to reinit sound output\n");
+            streamer_set_nextsong (-2, 0);
+        }
     }
 }