From b6164a64d5c67e7db1d375408ce7e3e48ef1f361 Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 26 Dec 2004 23:54:44 +0000
Subject: Cleanup

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@800 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/clif.c   | 3 ++-
 src/map/itemdb.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/map/clif.c b/src/map/clif.c
index acfb5c0ee..225429f11 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7272,7 +7272,8 @@ void clif_parse_WantToConnection(int fd, struct map_session_data *sd)
 	if ((old_sd = map_id2sd(account_id)) != NULL) {
 		clif_authfail_fd(fd, 8); // still recognizes last connection
 		clif_authfail_fd(old_sd->fd, 2); // same id
-		clif_setwaitclose(sd->fd); // Set session to EOF
+		if (sd != 0)
+			clif_setwaitclose(sd->fd); // Set session to EOF
 	} else {
 		sd = session[fd]->session_data = (struct map_session_data*)aCalloc(1, sizeof(struct map_session_data));
 		sd->fd = fd;
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 566037c6a..ee1e95ac7 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -592,8 +592,8 @@ static int itemdb_read_itemslottable(void)
 	buf[s]=0;
 	for(p=buf;p-buf<s;){
 		int nameid,equip;
-		sscanf(p,"%d#%d#",&nameid,&equip);
 		struct item_data* item = itemdb_search(nameid);
+		sscanf(p,"%d#%d#",&nameid,&equip);
 		if (item && itemdb_isequip2(item))
 			item->equip=equip;
 		p=strchr(p,10);
-- 
cgit v1.2.3-70-g09d2