# HG changeset patch # User displacer # Date 1170461092 0 # Node ID e4cd3cd209c6373581c479085d2488308aca83f2 # Parent dde4a4a3e0e1fd46b2673096a1d82d715da08ace additional error checking diff -r dde4a4a3e0e1 -r e4cd3cd209c6 QTfrontend/game.cpp --- a/QTfrontend/game.cpp Fri Feb 02 21:04:36 2007 +0000 +++ b/QTfrontend/game.cpp Sat Feb 03 00:04:52 2007 +0000 @@ -260,6 +260,7 @@ stream.writeRawData(demo->constData(), demo->size()); demofile.close(); delete demo; + demo=0; } void HWGame::PlayDemo(const QString & demofilename) diff -r dde4a4a3e0e1 -r e4cd3cd209c6 QTfrontend/tcpBase.cpp --- a/QTfrontend/tcpBase.cpp Fri Feb 02 21:04:36 2007 +0000 +++ b/QTfrontend/tcpBase.cpp Sat Feb 03 00:04:52 2007 +0000 @@ -149,7 +149,9 @@ if(m_isDemoMode) demo->append(toSendBuf); toSendBuf.clear(); } - IPCSocket->write(buf); - if(m_isDemoMode) demo->append(buf); + if(!buf.isEmpty()) { + IPCSocket->write(buf); + if(m_isDemoMode && demo) demo->append(buf); + } } } diff -r dde4a4a3e0e1 -r e4cd3cd209c6 QTfrontend/teamselhelper.cpp --- a/QTfrontend/teamselhelper.cpp Fri Feb 02 21:04:36 2007 +0000 +++ b/QTfrontend/teamselhelper.cpp Sat Feb 03 00:04:52 2007 +0000 @@ -125,7 +125,6 @@ pOurFrameTeams->availableColors.end(), color); if(pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { // error condition - throw; pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin(); } }