Commit: 3147116cf3a27dd3260fcb0c7df8fbbe970788b6 - zandrodev (hg)

Commit MetaInfo

• Revisión: 3147116cf3a27dd3260fcb0c7df8fbbe970788b6 (tree)
• Tiempo: 2021-12-02 14:13:21
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed color codes appearing in the hostname when the server was minimized in the systray.

Cambiar Resumen

• modified: src/win32/serverconsole/serverconsole.cpp

Diferencia incremental

diff -r e621cccd7a0e -r 3147116cf3a2 src/win32/serverconsole/serverconsole.cpp
--- a/src/win32/serverconsole/serverconsole.cpp	Sat Dec 04 18:05:39 2021 +0100
+++ b/src/win32/serverconsole/serverconsole.cpp	Thu Dec 02 00:13:21 2021 -0500
@@ -512,8 +512,7 @@
 			RECT			ThisWindowRect;
 			ANIMATIONINFO	AnimationInfo;
 			NOTIFYICONDATA	NotifyIconData;
-			UCVarValue		Val;
-			char			szString[64];
+			FString			uncolorizedHostname;
 
 			AnimationInfo.cbSize = sizeof( AnimationInfo );
 			SystemParametersInfo( SPI_GETANIMATION, sizeof( AnimationInfo ), &AnimationInfo, 0 );
@@ -547,10 +546,12 @@
 			NotifyIconData.uCallbackMessage = UWM_TRAY_TRAYID;
 			NotifyIconData.hIcon = g_hSmallIcon;
 			
-			Val = sv_hostname.GetGenericRep( CVAR_String );
-			strncpy( szString, Val.String, 63 );
-			szString[63] = 0;
-			lstrcpy( NotifyIconData.szTip, szString );
+			// [AK] Remove any color codes in the server name before sending it off.
+			uncolorizedHostname = sv_hostname.GetGenericRep( CVAR_String ).String;
+			V_ColorizeString( uncolorizedHostname );
+			V_RemoveColorCodes( uncolorizedHostname );
+
+			lstrcpy( NotifyIconData.szTip, uncolorizedHostname.GetChars( ));
 
 			Shell_NotifyIcon( NIM_ADD, &NotifyIconData );
 			break;