X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fmsg.c;h=2b501672ac50a87cfbce426887d0b9c63475809d;hb=6516331968f11dd9e5c495572f27cc69fa3d4c48;hp=b03d64d0c242a4324a27adcbf0fbededf9762f0a;hpb=bfacdd3b71576cf6ceaa83352d3a7d162adb75e1;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c
index b03d64d0..2b501672 100644
--- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c
+++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c
@@ -16,6 +16,7 @@
 // === CONSTANTS ===
 enum eConnectionType
 {
+	CONNTYPE_NONE,
 	CONNTYPE_SENDMESSAGE,
 	CONNTYPE_UDP,
 	CONNTYPE_TCP
@@ -121,12 +122,16 @@ tAxWin_IPCMessage *AxWin3_int_GetIPCMessage(void)
 	switch(giConnectionType)
 	{
 	case CONNTYPE_SENDMESSAGE:
-		// TODO: Less hack, I need a version of select for GetMessage etc
-		if(SysGetMessage(NULL, NULL) == 0)	_SysWaitEvent(THREAD_EVENT_IPCMSG);
-		while(SysGetMessage(NULL, NULL))
+		for( ;; )
 		{
 			pid_t	tid;
-			len = SysGetMessage(&tid, NULL);
+		
+			// Wait for a message to arrive	
+			while( !(len = SysGetMessage(&tid, NULL)) )
+			{
+				_SysWaitEvent(THREAD_EVENT_IPCMSG);
+			}
+			
 			// Check if the message came from the server
 			if(tid != giConnectionNum)
 			{