From: Mario <mario.mario@y7mail.com>
Date: Tue, 14 Jul 2020 18:25:05 +0000 (+1000)
Subject: Don't override title and description if none was provided by the map
X-Git-Tag: xonotic-v0.8.6~328^2~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9634d86b306b3ad544682d646b509e0555a7b438;p=xonotic%2Fxonotic-data.pk3dir.git

Don't override title and description if none was provided by the map
---

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index cc9c0f93c..4e91ba1d9 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -799,13 +799,15 @@ bool _MapInfo_ParseArena(int fh, string pFilename, Gametype pGametypeToSet, bool
 			testing_map = false;
 			if(dosave)
 			{
-				MapInfo_Map_description = stored_Map_description;
-				MapInfo_Map_title = stored_Map_title;
+				if(stored_Map_description != "")
+					MapInfo_Map_description = stored_Map_description;
+				if(stored_Map_title != "")
+					MapInfo_Map_title = stored_Map_title;
 				FOREACH(Gametypes, it.m_flags & stored_supportedGametypes,
 				{
 					_MapInfo_Map_ApplyGametype ("", pGametypeToSet, it, true);
 				});
-				break; // no need to continue through the file, we have our map!
+				return true; // no need to continue through the file, we have our map!
 			}
 			else
 			{