Fix Logo to use the correct path separator -- #19

George-lewis · Dec 21, 2019 · 3f0b5ef · 3f0b5ef
1 parent 59c6e9e
commit 3f0b5ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/config.h b/src/config.h
@@ -12,18 +12,20 @@ namespace DVD {
 
     class Config {
 
-        #if defined(WIN32) || defined(_WIN32)
-        static const char PATHSEP = '\\';
-        #else
-        static const char PATHSEP = '/';
-        #endif
-
         static std::string config_file, arg0;
 
         static std::unordered_map<std::string, std::string> _default, read;
 
         public:
 
+            // Windows and Unix use different path separators
+            // This is to handle that
+            #if defined(WIN32) || defined(_WIN32)
+            static const char PATHSEP = '\\';
+            #else
+            static const char PATHSEP = '/';
+            #endif
+
             static bool parseCommandLine(int argc, char** argv);
 
             static void readConfig();

diff --git a/src/logo.cpp b/src/logo.cpp
@@ -37,7 +37,7 @@ void Logo::load_images() {
 
 		std::stringstream filename;
 
-		filename << "resources/dvdlogo-0" << i << ".png";
+		filename << "resources" << DVD::Config::PATHSEP << "dvdlogo-0" << i << ".png";
 
 		std::cout << "Load file: \"" << Config::getRelative(filename.str()) << '"' << std::endl;