Fixed crashing on disconnect

mumble-voip · Oct 17, 2017 · 971ff20 · 971ff20
1 parent a8d8c13
commit 971ff20
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp
@@ -110,6 +110,8 @@ ServerHandler::ServerHandler() {
 	if (hQoS)
 		Connection::setQoS(hQoS);
 #endif
+
+  connect(this, SIGNAL(pingRequested()), this, SLOT(sendPingInternal()), Qt::QueuedConnection);
 }
 
 ServerHandler::~ServerHandler() {
@@ -447,6 +449,10 @@ void ServerHandler::setSslErrors(const QList<QSslError> &errors) {
 }
 
 void ServerHandler::sendPing() {
+	emit pingRequested();
+}
+
+void ServerHandler::sendPingInternal() {
 	ConnectionPtr connection(cConnection);
 	if (!connection)
 		return;
@@ -688,6 +694,9 @@ void ServerHandler::serverConnectionConnected() {
 		}
 
 		qusUdp = new QUdpSocket(this);
+		if (qusUdp == nullptr) {
+			qFatal("ServerHandler: qusUdp is unexpectedly a null addr");
+		}
 		if (g.s.bUdpForceTcpAddr) {
 			qusUdp->bind(qhaLocal, 0);
 		} else {
@@ -698,7 +707,7 @@ void ServerHandler::serverConnectionConnected() {
 			}
 		}
 
-		connect(qusUdp, SIGNAL(readyRead()), this, SLOT(udpReady()));
+		connect(qusUdp, SIGNAL(readyRead()), this, SLOT(udpReady()), Qt::QueuedConnection);
 
 		if (g.s.bQoS) {
 

diff --git a/src/mumble/ServerHandler.h b/src/mumble/ServerHandler.h
@@ -137,6 +137,7 @@ class ServerHandler : public QThread {
 	signals:
 		void disconnected(QAbstractSocket::SocketError, QString reason);
 		void connected();
+		void pingRequested();
 	protected slots:
 		void message(unsigned int, const QByteArray &);
 		void serverConnectionConnected();
@@ -146,6 +147,8 @@ class ServerHandler : public QThread {
 		void setSslErrors(const QList<QSslError> &);
 		void udpReady();
 		void hostnameResolved();
+	private slots:
+		void sendPingInternal();
 	public slots:
 		void sendPing();
 };