From 2275466d0961b245eee2dd9324bb3468ced68812 Mon Sep 17 00:00:00 2001
From: badaix <snapcast@badaix.de>
Date: Sun, 1 May 2016 19:18:18 +0200
Subject: [PATCH] better server shutdown

---
 server/streamServer.cpp           | 14 +++++++-------
 server/streamreader/pcmStream.cpp |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/server/streamServer.cpp b/server/streamServer.cpp
index 08925186..d93eca19 100644
--- a/server/streamServer.cpp
+++ b/server/streamServer.cpp
@@ -389,6 +389,13 @@ void StreamServer::start()
 
 void StreamServer::stop()
 {
+//	std::lock_guard<std::mutex> mlock(sessionsMutex_);
+	for (auto session: sessions_)//it = sessions_.begin(); it != sessions_.end(); ++it)
+	{
+		if (session)
+			session->stop();
+	}
+
 	if (controlServer_)
 	{
 		controlServer_->stop();
@@ -406,12 +413,5 @@ void StreamServer::stop()
 		streamManager_->stop();
 		streamManager_ = nullptr;
 	}
-//	std::lock_guard<std::mutex> mlock(sessionsMutex_);
-	for (auto session: sessions_)//it = sessions_.begin(); it != sessions_.end(); ++it)
-	{
-		if (session)
-			session->stop();
-	}
-	
 }
 
diff --git a/server/streamreader/pcmStream.cpp b/server/streamreader/pcmStream.cpp
index 5042c2c9..6b1016e0 100644
--- a/server/streamreader/pcmStream.cpp
+++ b/server/streamreader/pcmStream.cpp
@@ -87,7 +87,6 @@ const SampleFormat& PcmStream::getSampleFormat() const
 void PcmStream::start()
 {
 	logD << "PcmStream start: " << sampleFormat_.getFormat() << "\n";
-//TODO: wrong encoder settings leads to: terminate called after throwing an instance of 'std::system_error'  what():  Invalid argument
 	encoder_->init(this, sampleFormat_);
 
  	active_ = true;