flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into foldermove2

Browse Source 
Conflicts:
	VC2008/MCServer.vcproj
This commit is contained in:
Alexander Harkness
2013-11-26 17:21:06 +00:00
parent 139bd34690 686e0c12e2
commit 0de95a215f
20 changed files with 282 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/OSSupport/File.cpp
View File

@@ -394,13 +394,14 @@ AStringVector cFile::GetFolderContents(const AString & a_Folder)
DIR * dp;
struct dirent *dirp;
if (*a_Directory == 0)
AString Folder = a_Folder;
if (Folder.empty())
{
a_Directory = ".";
Folder = ".";
}
if ((dp = opendir(a_Directory)) == NULL)
if ((dp = opendir(Folder.c_str())) == NULL)
{
LOGERROR("Error (%i) opening directory \"%s\"\n", errno, a_Directory );
LOGERROR("Error (%i) opening directory \"%s\"\n", errno, Folder.c_str());
}
else
{