From: APTX <marek321@gmail.com>
Date: Wed, 11 Jul 2012 00:46:18 +0000 (+0200)
Subject: Do not allow leaving from error state without calling clearErrors()
X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=9c231d940da00793a07b11f1c4b4977cee8cd64a;p=anidbudpclient.git

Do not allow leaving from error state without calling clearErrors()
---

diff --git a/client.cpp b/client.cpp
index 775c67f..5fd2110 100644
--- a/client.cpp
+++ b/client.cpp
@@ -91,7 +91,6 @@ qDebug() << "Api instance init!";
 
 	// ------------- Transitions ---------------------
 	errorState->addTransition(this, SIGNAL(clearErrorsRequested()), disconnectedState);
-	errorState->addTransition(this, SIGNAL(startConnecting()), connectingState);
 
 	connectedState->addTransition(this, SIGNAL(startDisconnecting()), disconnectedState);
 	connectedState->addTransition(socket, SIGNAL(readyRead()), recieveState);
@@ -124,9 +123,7 @@ qDebug() << "Api instance init!";
 	recieveState->addTransition(this, SIGNAL(connectionError()), errorState);
 	recieveState->addTransition(this, SIGNAL(replyRecieved()), connectedHistoryState);
 
-
 	recieveFailState->addTransition(this, SIGNAL(connectionError()), errorState);
-
 	recieveFailState->addTransition(sendState);
 	// ------------ END Transitions -------------------
 
@@ -948,6 +945,9 @@ void Client::cancel(AbstractReply *reply)
 void Client::clearErrors()
 {
 	emit clearErrorsRequested();
+
+	// Make sure Client leaves the error state
+	QCoreApplication::processEvents();
 }
 
 void Client::logout()