simspark-cvs

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/sparkmonitor
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/plugin/sparkmonitor

Modified Files:
	sparkmonitorclient.cpp 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: sparkmonitorclient.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkmonitor/sparkmonitorclient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sparkmonitorclient.cpp	13 Dec 2005 21:48:50 -0000	1.1
--- sparkmonitorclient.cpp	15 Mar 2007 07:26:29 -0000	1.2
***************
*** 99,106 ****
  
      string msg;
!     while (mNetMessage->Extract(mNetBuffer, msg))
          {
              ParseMessage(msg);
          }
  }
  
--- 99,110 ----
  
      string msg;
! 
!     if (mNetMessage.get() != 0)
!     {
!         while (mNetMessage->Extract(mNetBuffer, msg))
          {
              ParseMessage(msg);
          }
+     }
  }