X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fwatchbsp.cpp;h=9754831701be404ed3dbbaa139cc326a644c6958;hb=76eb10a91476f04881e45560977a403cce8efcd6;hp=bbae3fab77af86854c191e8d4656fd249961213e;hpb=f32d0142f9d3c220966cd608ed0082133f331de5;p=xonotic%2Fnetradiant.git

diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index bbae3fab..97548317 100644
--- a/radiant/watchbsp.cpp
+++ b/radiant/watchbsp.cpp
@@ -273,8 +273,8 @@ static void saxStartElement( message_info_t *data, const xmlChar *name, const xm
 				else if ( strcmp( reinterpret_cast<const char*>( attrs[1] ), Q3MAP_STREAM_VERSION ) != 0 ) {
 					message_flush( data );
 					globalErrorStream() <<
-					"This version of Radiant reads version " Q3MAP_STREAM_VERSION " debug streams, I got an incoming connection with version " << reinterpret_cast<const char*>( attrs[1] ) << "\n"
-																																															   "Please make sure your versions of Radiant and q3map are matching.\n";
+					"This version of " RADIANT_NAME " reads version " Q3MAP_STREAM_VERSION " debug streams, I got an incoming connection with version " << reinterpret_cast<const char*>( attrs[1] ) << "\n"
+																																															   "Please make sure your versions of " RADIANT_NAME " and q3map are matching.\n";
 					abortStream( data );
 					return;
 				}
@@ -469,7 +469,7 @@ static xmlSAXHandler saxParser = {
 // ------------------------------------------------------------------------------------------------
 
 
-guint s_routine_id;
+guint s_routine_id = 0;
 static gint watchbsp_routine( gpointer data ){
 	reinterpret_cast<CWatchBSP*>( data )->RoutineProcessing();
 	return TRUE;
@@ -489,8 +489,9 @@ void CWatchBSP::Reset(){
 		m_xmlInputBuffer = NULL;
 	}
 	m_eState = EIdle;
-	if ( s_routine_id ) {
+	if ( s_routine_id != 0 ) {
 		g_source_remove( s_routine_id );
+		s_routine_id = 0;
 	}
 }