From 24ab4a2f49b39056a9eaed6bdb2f5549933179ef Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 17 Apr 2025 18:40:18 -0500 Subject: [PATCH] return to while --- modules/ClientModule/src/ClientModule.cpp | 11 ++++------- modules/ServerModule/src/ServerModule.cpp | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/ClientModule/src/ClientModule.cpp b/modules/ClientModule/src/ClientModule.cpp index 8679194..92dd58c 100644 --- a/modules/ClientModule/src/ClientModule.cpp +++ b/modules/ClientModule/src/ClientModule.cpp @@ -125,19 +125,16 @@ bool ClientModule::onEvent(const Archimedes::Event& event) { void ClientModule::pollIncomingData() { - int numMsgs; - do { + while(running) { ISteamNetworkingMessage *pIncomingMsg = nullptr; - numMsgs = interface->ReceiveMessagesOnConnection( connection, &pIncomingMsg, 1 ); + int numMsgs = interface->ReceiveMessagesOnConnection( connection, &pIncomingMsg, 1 ); if ( numMsgs == 0 ) - return; + break; if ( numMsgs < 0 ) std::cerr << "Error checking for messages" << std::endl; assert( numMsgs == 1 && pIncomingMsg ); assert( pIncomingMsg->m_conn == connection ); app->emitEvent(new CMEvent::DataRecievedEvent(pIncomingMsg)); - //numMsgs--; - return; - } while (numMsgs > 0); + } } diff --git a/modules/ServerModule/src/ServerModule.cpp b/modules/ServerModule/src/ServerModule.cpp index 3a119d5..b01e86c 100644 --- a/modules/ServerModule/src/ServerModule.cpp +++ b/modules/ServerModule/src/ServerModule.cpp @@ -209,7 +209,7 @@ void ServerModule::pollIncomingData() { ISteamNetworkingMessage *pIncomingMsg = nullptr; int numMsgs = interface->ReceiveMessagesOnPollGroup( pollGroup, &pIncomingMsg, 1 ); if ( numMsgs == 0 ) - return; + break; if ( numMsgs < 0 ) std::cerr << "Error checking for messages" << std::endl; assert( numMsgs == 1 && pIncomingMsg ); @@ -217,6 +217,5 @@ void ServerModule::pollIncomingData() { assert( itClient != clients.end() ); app->emitEvent(new SMEvent::DataRecievedEvent(pIncomingMsg)); - return; } }