}
void CoreSession::serverDisconnected(uint networkid) {
- servers.remove(networkid);
- delete servers[networkid];
+ Q_ASSERT(servers.contains(networkid));
+ servers.take(networkid)->deleteLater();
+ Q_ASSERT(!servers.contains(networkid));
}
void CoreSession::msgFromGui(BufferInfo bufid, QString msg) {
void Server::run() {
connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected()));
- connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+ connect(&socket, SIGNAL(disconnected()), this, SLOT(quit()));
connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError)));
connect(&socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState)));
connect(&socket, SIGNAL(readyRead()), this, SLOT(socketHasData()));
+ connect(this, SIGNAL(finished()), this, SLOT(threadFinished()));
exec();
}
//qDebug() << "Socket Error!";
}
-void Server::socketConnected( ) {
+void Server::socketConnected() {
emit connected(networkId());
putRawLine(QString("NICK :%1").arg(identity["NickList"].toStringList()[0])); // FIXME: try more nicks if error occurs
putRawLine(QString("USER %1 8 * :%2").arg(identity["Ident"].toString()).arg(identity["RealName"].toString()));
}
-void Server::socketDisconnected( ) {
+void Server::threadFinished() {
+ // the Socket::disconnected() is connect to this::quit()
+ // so after the event loop is finished we're beeing called
+ // and propagate the disconnect
emit disconnected(networkId());
- // propagate to networkInfo, so we can clear up
}
void Server::socketStateChanged(QAbstractSocket::SocketState state) {
void putRawLine(QString input);
void putCmd(QString cmd, QStringList params, QString prefix = 0);
- //void exitThread();
+
+private slots:
+ void threadFinished();
signals:
void serverState(QString net, QVariantMap data);
void socketHasData();
void socketError(QAbstractSocket::SocketError);
void socketConnected();
- void socketDisconnected();
void socketStateChanged(QAbstractSocket::SocketState);
private: