Merge remote-tracking branch 'origin/master'

src/net/common/serverlobbythread.cpp

@@ -1375,7 +1375,8 @@ ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr<SessionData> sessio
 				&& tmpData.gameType != GAME_TYPE_NORMAL && !joinGame.spectateonly()) {
 			SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_GUEST_FORBIDDEN);
 		} else if (tmpData.gameType == GAME_TYPE_INVITE_ONLY
-				   && !game->IsPlayerInvited(session->GetPlayerData()->GetUniqueId())) {
+				   && !game->IsPlayerInvited(session->GetPlayerData()->GetUniqueId())
+				   && !joinGame.spectateonly()) {
 			SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_NOT_INVITED);
 		} else if (!game->CheckPassword(password)) {
 			SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_INVALID_PASSWORD);

src/third_party/websocketpp/websocketpp/close.hpp

@@ -197,7 +197,7 @@ union code_converter {
  *
  * If the value is in an invalid or reserved range ec is set accordingly.
  *
- * @param [in] payload Close frame payload value recieved over the wire.
+ * @param [in] payload Close frame payload value received over the wire.
  * @param [out] ec Set to indicate what error occurred, if any.
  * @return The extracted value
  */

src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp

@@ -624,7 +624,7 @@ void connection<config>::handle_transport_init(lib::error_code const & ec) {
 
     if (ec) {
         std::stringstream s;
-        s << "handle_transport_init recieved error: "<< ec.message();
+        s << "handle_transport_init received error: "<< ec.message();
         m_elog.write(log::elevel::fatal,s.str());
 
         this->terminate(ec);