2 files changed, 8 insertions, 11 deletions
diff --git a/Swiften/Client/ClientError.h b/Swiften/Client/ClientError.h
index d81cc0e..d4f280c 100644
--- a/Swiften/Client/ClientError.h
+++ b/Swiften/Client/ClientError.h
@@ -1,14 +1,13 @@
-#ifndef SWIFTEN_ClientError_H
-#define SWIFTEN_ClientError_H
+#pragma once
 
 namespace Swift {
 	class ClientError {
 		public:
 			enum Type {
-				NoError,
+				UnknownError,
 				DomainNameResolveError,
 				ConnectionError,
 				ConnectionReadError,
 				ConnectionWriteError,
 				XMLError,
 				AuthenticationFailedError,
@@ -18,16 +17,14 @@ namespace Swift {
 				SessionStartError,
 				TLSError,
 				ClientCertificateLoadError,
 				ClientCertificateError
 			};
 
-			ClientError(Type type = NoError) : type_(type) {}
+			ClientError(Type type = UnknownError) : type_(type) {}
 
 			Type getType() const { return type_; }
 
 		private:
 			Type type_;
 	};
 }
-
-#endif
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp
index 8b14367..807470e 100644
--- a/Swiften/Session/BasicSessionStream.cpp
+++ b/Swiften/Session/BasicSessionStream.cpp
@@ -72,20 +72,20 @@ void BasicSessionStream::addTLSEncryption() {
 		tlsLayer->onConnected.connect(boost::bind(&BasicSessionStream::handleTLSConnected, shared_from_this()));
 		tlsLayer->connect();
 	}
 }
 
 void BasicSessionStream::setWhitespacePingEnabled(bool enabled) {
-	if (enabled && !whitespacePingLayer) {
-		whitespacePingLayer = boost::shared_ptr<WhitespacePingLayer>(new WhitespacePingLayer());
-		streamStack->addLayer(whitespacePingLayer);
-	}
 	if (enabled) {
+		if (!whitespacePingLayer) {
+			whitespacePingLayer = boost::shared_ptr<WhitespacePingLayer>(new WhitespacePingLayer());
+			streamStack->addLayer(whitespacePingLayer);
+		}
 		whitespacePingLayer->setActive();
 	}
-	else {
+	else if (whitespacePingLayer) {
 		whitespacePingLayer->setInactive();
 	}
 }
 
 void BasicSessionStream::resetXMPPParser() {
   xmppLayer->resetParser();