Removing the answer during the check except if NO_ANSWER

jamoma · Sep 17, 2013 · 9d6c42f · 9d6c42f
1 parent bac0d72
commit 9d6c42f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Modular/extensions/Minuit/source/Minuit.cpp b/Modular/extensions/Minuit/source/Minuit.cpp
@@ -240,7 +240,7 @@ TTErr Minuit::SendDiscoverRequest(TTSymbol to, TTAddress address,
 			return mAnswerManager->ParseDiscoverAnswer(answer, returnedType, returnedChildren, returnedAttributes);
 
         else if (state == TIMEOUT_EXCEEDED && tryCount < MAX_TRY)
-            SendDiscoverRequest(to, address, returnedType, returnedChildren, returnedAttributes, tryCount++);
+            return SendDiscoverRequest(to, address, returnedType, returnedChildren, returnedAttributes, tryCount++);
 	}
 
 	return kTTErrGeneric;
@@ -292,7 +292,7 @@ TTErr Minuit::SendGetRequest(TTSymbol to, TTAddress address,
             return kTTErrNone;
 
         else if (state == TIMEOUT_EXCEEDED && tryCount < MAX_TRY)
-            SendGetRequest(to, address, returnedValue, tryCount++);
+            return SendGetRequest(to, address, returnedValue, tryCount++);
     }
 
 	return kTTErrGeneric;

diff --git a/Modular/extensions/Minuit/source/MinuitAnswerManager.cpp b/Modular/extensions/Minuit/source/MinuitAnswerManager.cpp
@@ -86,7 +86,7 @@ int MinuitAnswerManager::CheckDiscoverAnswer(TTSymbol from, TTAddress address, T
 		state = anAnswer->getState();
 
 		// if an answer is received
-		if(state == ANSWER_RECEIVED)
+		if(state != NO_ANSWER)
 		{
 			// get the answer
 			anAnswer->getAnswer(value);
@@ -225,7 +225,7 @@ int MinuitAnswerManager::CheckGetAnswer(TTSymbol from, TTAddress address, TTValu
 		state = anAnswer->getState();
 
 		// if an answer is received
-		if(state == ANSWER_RECEIVED)
+		if(state != NO_ANSWER)
 		{
 			// get the answer
 			anAnswer->getAnswer(value);