From 46733d74c81b5fccdb1e557cbceb8e977e876e47 Mon Sep 17 00:00:00 2001
From: eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 25 Dec 2011 10:14:42 +0000
Subject: * Merged changes up to eAthena 15049.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15264 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/common/grfio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/common/grfio.c b/src/common/grfio.c
index e10a71a32..57e942892 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -672,7 +672,7 @@ static bool grfio_parse_restable_row(const char* row)
 	char local[256];
 	FILELIST* entry;
 
-	if( sscanf(row, "%[^#]#%[^#]#", w1, w2) != 2 )
+	if( sscanf(row, "%[^#\r\n]#%[^#\r\n]#", w1, w2) != 2 )
 		return false;
 
 	if( strstr(w2, ".gat") == NULL && strstr(w2, ".rsw") == NULL )
-- 
cgit v1.2.3-60-g2f50