Merge 'remotes/trunk'

0ad · Sep 15, 2015 · aa3abfb · aa3abfb
2 parents fb58bd3 + 8b6d771
commit aa3abfb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/source/lobby/XmppClient.cpp b/source/lobby/XmppClient.cpp
@@ -68,7 +68,7 @@ IXmppClient* IXmppClient::create(const std::string& sUsername, const std::string
  * @param regOpt If we are just registering or not.
  */
 XmppClient::XmppClient(const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, const int historyRequestSize, bool regOpt)
-	: m_client(NULL), m_mucRoom(NULL), m_registration(NULL), m_username(sUsername), m_password(sPassword), m_nick(sNick)
+	: m_client(NULL), m_mucRoom(NULL), m_registration(NULL), m_username(sUsername), m_password(sPassword), m_nick(sNick), m_initialLoadComplete(false)
 {
 	// Read lobby configuration from default.cfg
 	std::string sServer;

diff --git a/source/lobby/XmppClient.h b/source/lobby/XmppClient.h
@@ -38,26 +38,26 @@ class XmppClient : public IXmppClient, public glooxwrapper::ConnectionListener,
 	NONCOPYABLE(XmppClient);
 
 private:
-	//Components
+	// Components
 	glooxwrapper::Client* m_client;
 	glooxwrapper::MUCRoom* m_mucRoom;
 	glooxwrapper::Registration* m_registration;
 
-	//Account infos
+	// Account infos
 	std::string m_username;
 	std::string m_password;
 	std::string m_nick;
 	std::string m_xpartamuppId;
 
 	// State
-	bool m_initialLoadComplete = false;
+	bool m_initialLoadComplete;
 
 public:
-	//Basic
+	// Basic
 	XmppClient(const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, const int historyRequestSize = 0, const bool regOpt = false);
 	virtual ~XmppClient();
 
-	//Network
+	// Network
 	void connect();
 	void disconnect();
 	void recv();