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

Merge pull request #3625 from Seadragon91/patch-1

Browse Source 
Removed unnecessary check for lower and upper folder
This commit is contained in:
Lukas Pioch 2017-03-16 19:33:48 +01:00 committed by GitHub
commit e70b399435
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bindings/PluginManager.cpp
View File

@ -68,7 +68,7 @@ void cPluginManager::RefreshPluginList(void)
AStringVector Folders; AStringVector Folders;
for (auto & item: Contents) for (auto & item: Contents)
{ {
if ((item == ".") || (item == "..") || (!cFile::IsFolder(PluginsPath + item))) if (!cFile::IsFolder(PluginsPath + item))
{ {
// We only want folders, and don't want "." or ".." // We only want folders, and don't want "." or ".."
continue; continue;

6
src/OSSupport/File.cpp
View File

@ -336,12 +336,6 @@ bool cFile::DeleteFolderContents(const AString & a_FolderName)
auto Contents = cFile::GetFolderContents(a_FolderName); auto Contents = cFile::GetFolderContents(a_FolderName);
for (const auto & item: Contents) for (const auto & item: Contents)
{ {
// Skip "." and ".." altogether:
if ((item == ".") || (item == ".."))
{
continue;
}
// Remove the item: // Remove the item:
auto WholePath = a_FolderName + GetPathSeparator() + item; auto WholePath = a_FolderName + GetPathSeparator() + item;
if (IsFolder(WholePath)) if (IsFolder(WholePath))