diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-11-18 18:02:28 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-11-18 18:02:28 (GMT) |
| commit | af29942117a828e244195a530d2aa40fa9b2a5e2 (patch) | |
| tree | 18bf32a5d5893cdc73f29d737fa09e50d97a206a /src | |
| parent | 0be465aa4e658a75cad201b0f6f32b20acea9c9f (diff) | |
| download | powder-af29942117a828e244195a530d2aa40fa9b2a5e2.zip powder-af29942117a828e244195a530d2aa40fa9b2a5e2.tar.gz | |
Ensure directory enumeration works whether there's a path seperator at the end of the directory or not
Diffstat (limited to 'src')
| -rw-r--r-- | src/Config.h | 4 | ||||
| -rw-r--r-- | src/client/Client.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Config.h b/src/Config.h index 5d2a1a5..d30c9b1 100644 --- a/src/Config.h +++ b/src/Config.h @@ -11,8 +11,10 @@ #ifdef WIN #define PATH_SEP "\\" +#define PATH_SEP_CHAR '\\' #else #define PATH_SEP "/" +#define PATH_SEP_CHAR '/' #endif //VersionInfoStart @@ -89,6 +91,8 @@ #define STAMPS_DIR "stamps" +#define BRUSH_DIR "Brushes" + #define APPDATA_SUBDIR "\\HardWIRED" //Number of unique thumbnails to have in cache at one time diff --git a/src/client/Client.cpp b/src/client/Client.cpp index 763814a..bde66d2 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -367,6 +367,9 @@ std::vector<std::string> Client::DirectorySearch(std::string directory, std::str std::vector<std::string> Client::DirectorySearch(std::string directory, std::string search, std::vector<std::string> extensions) { //Get full file listing + //Normalise directory string, ensure / or \ is present + if(*directory.rbegin() != '/' && *directory.rbegin() != '\\') + directory += PATH_SEP; std::vector<std::string> directoryList; #if defined(WIN) && !defined(__GNUC__) //Windows |