Merge commit '146d231d90b19e2a0edcabff1c4eb9ca44e053e7' into master-merge

[xonotic/netradiant.git] / radiant / watchbsp.cpp

diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index bbae3fab77af86854c191e8d4656fd249961213e..9754831701be404ed3dbbaa139cc326a644c6958 100644 (file)
--- 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;
        }
 }