added code to ensure that environment-paths (log, data, media, etc) always end with...

diff --git a/common/env.cpp b/common/env.cpp
index 6534bc052d865a0437d786ba1772fc1ec6db165f..1d0361ad5096f939b5e5a7a29b04f1feaad71ae0 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -70,6 +70,18 @@ void configure(const std::wstring& filename)
                data = widen(paths.get(L"data-path", initialPath + L"\\data\\"));\r
                thumbnails = widen(paths.get(L"thumbnails-path", initialPath + L"\\thumbnails\\"));\r
 \r
+               //Make sure that all paths have a trailing backslash\r
+               if(media.at(media.length()-1) != L'\\')\r
+                       media.append(L"\\");\r
+               if(log.at(log.length()-1) != L'\\')\r
+                       log.append(L"\\");\r
+               if(ftemplate.at(ftemplate.length()-1) != L'\\')\r
+                       ftemplate.append(L"\\");\r
+               if(data.at(data.length()-1) != L'\\')\r
+                       data.append(L"\\");\r
+               if(thumbnails.at(thumbnails.length()-1) != L'\\')\r
+                       thumbnails.append(L"\\");\r
+\r
                try\r
                {\r
                        for(auto it = boost::filesystem2::wdirectory_iterator(initialPath); it != boost::filesystem2::wdirectory_iterator(); ++it)\r