Merge branch 'drjaska/wep-reload-fixes' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / command / generic.qc

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 5e339e85c4e90f6435540ce10e2c80bba225c2b9..3ce25e26d71272da71edde5d46f32ae482c7d879 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -274,11 +274,13 @@ void GenericCommand_maplist(int request, int argc)
                                {
                                        if(argc == 3)
                                        {
+                                               // save argv(2) from being overridden by tokenize engine call
+                                               string del_map_name = argv(2);
                                                argc = tokenizebyseparator(cvar_string("g_maplist"), " ");
 
                                                tmp_string = "";
                                                for(i = 0; i < argc; ++i)
-                                                       if(argv(i) != argv(2))
+                                                       if(argv(i) != del_map_name)
                                                                tmp_string = strcat(tmp_string, " ", argv(i));
 
                                                tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1);
@@ -409,7 +411,7 @@ void GenericCommand_restartnotifs(int request)
                        Destroy_All_Notifications();
                        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
                        #else
-                       LOG_INFO(_("Notification restart command only works with cl_cmd and sv_cmd."));
+                       LOG_INFO("Notification restart command only works with cl_cmd and sv_cmd.");
                        #endif
                        return;
                }