server crash fix

common/protocol_datastructures.h

@@ -53,6 +53,7 @@ public:
 	ServerInfo_User(const ServerInfo_User *other, bool complete = true);
 	static SerializableItem *newItem() { return new ServerInfo_User; }
 	QString getName() const { return static_cast<SerializableItem_String *>(itemMap.value("name"))->getData(); }
+	void setName(const QString &_name) { static_cast<SerializableItem_String *>(itemMap.value("name"))->setData(_name); }
 	int getUserLevel() const { return static_cast<SerializableItem_Int *>(itemMap.value("userlevel"))->getData(); }
 	void setUserLevel(int _userLevel) { static_cast<SerializableItem_Int *>(itemMap.value("userlevel"))->setData(_userLevel); }
 	QString getRealName() const { return static_cast<SerializableItem_String *>(itemMap.value("real_name"))->getData(); }

common/server.cpp

@@ -73,6 +73,7 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
 		while (users.contains(tempName) || userExists(tempName))
 			tempName = name + "_" + QString::number(++i);
 		name = tempName;
+		data->setName(name);
 	}
 	
 	session->setUserInfo(data);

servatrice/src/servatrice.cpp

@@ -220,7 +220,7 @@ bool Servatrice::userExists(const QString &user)
 		checkSql();
 	
 		QSqlQuery query;
-		query.prepare("select 1 from " + dbPrefix + "_users where name = :name");
+		query.prepare("select 1 from " + dbPrefix + "_users where name = :name and active = 1");
 		query.bindValue(":name", user);
 		if (!execSqlQuery(query))
 			return false;
@@ -423,4 +423,4 @@ void Servatrice::shutdownTimeout()
 		deleteLater();
 }
 
-const QString Servatrice::versionString = "Servatrice 0.20110625";
+const QString Servatrice::versionString = "Servatrice 0.20110803";