Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I think I got it ... messy / not appearing at the end of folders in the

Browse Source 
travis linux where it appears fine on mine :(
This commit is contained in:
xawotihs
2013-10-30 22:28:09 +01:00
parent f6c47b85e3
commit 784d127a6e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
projects/mtg/src/MTGDeck.cpp
View File

@@ -336,8 +336,18 @@ void MTGAllCards::init()
initCounters();
}
void MTGAllCards::loadFolder(const string& folder, const string& filename )
void MTGAllCards::loadFolder(const string& infolder, const string& filename )
{
string folder = infolder;
// Make sure the base paths finish with a '/' or a '\'
if (! folder.empty()) {
string::iterator c = folder.end();//userPath.at(userPath.size()-1);
c--;
if ((*c != '/') && (*c != '\\'))
folder += '/';
}
vector<string> files = JFileSystem::GetInstance()->scanfolder(folder);
if (!files.size())
@@ -355,7 +365,7 @@ void MTGAllCards::loadFolder(const string& folder, const string& filename )
continue;
if(JFileSystem::GetInstance()->DirExists(afile))
loadFolder(string(afile).c_str(), filename);
loadFolder(afile, filename);
if (!JFileSystem::GetInstance()->FileExists(afile))
continue;