From 84ec331e6f0c408231ca218834af9f3488428748 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Wed, 22 Dec 2004 18:58:54 +0000
Subject: [PATCH] Couple of bugfixes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@682 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/skin.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/engine/client/skin.c b/engine/client/skin.c
index fd0d71c5c..ef1b3629f 100644
--- a/engine/client/skin.c
+++ b/engine/client/skin.c
@@ -53,19 +53,23 @@ void Skin_Find (player_info_t *sc)
 	if (allskins[0])
 		s = allskins;
 	else
-	{
 		s = Info_ValueForKey (sc->userinfo, "skin");
-		if (!s[0])
-			s = baseskin.string;
-	}
-
-	if (*mn)
-		mn = va("%s/%s", mn, s);
 
 	if (strstr (mn, "..") || *mn == '.')
-		mn = "base";
+		mn = "";
 
-	COM_StripExtension (mn, name);
+	if (!*s)
+		s = baseskin.string;
+	if (!*s)
+		s = "default";
+
+	if (*mn)
+	{
+		mn = va("%s/%s", mn, s);
+		COM_StripExtension (mn, name);
+	}
+	else
+		COM_StripExtension (s, name);
 
 	s = strchr(name, '/');
 	if (s)
@@ -400,6 +404,12 @@ void	Skin_Skins_f (void)
 {
 	int		i;
 
+	if (cls.state == ca_disconnected)
+	{
+		Con_Printf ("Can't \"%s\", not connected\n", Cmd_Argv(0));
+		return;
+	}
+
 	for (i=0 ; i<numskins ; i++)
 	{
 		if (skins[i].cache.data)