Merge remote-tracking branch 'origin/main' into hashes

Endle · Sep 6, 2021 · 9934753 · 9934753
2 parents 189ca07 + 8febdf2
commit 9934753
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pdf_viewer/main.cpp b/pdf_viewer/main.cpp
@@ -225,11 +225,12 @@ void configure_paths(){
 
 void verify_paths(){
 #define CHECK_DIR_EXIST(path) do{ if(!(path).dir_exists() ) std::wcout << L"Error: " << #path << ": " << path << L" doesn't exist!\n"; } while(false)
+#define CHECK_FILE_EXIST(path) do{ if(!(path).file_exists() ) std::wcout << L"Error: " << #path << ": " << path << L" doesn't exist!\n"; } while(false)
 
     std::wcout << L"default_config_path: " << default_config_path << L"\n";
-    CHECK_DIR_EXIST(default_config_path);
+    CHECK_FILE_EXIST(default_config_path);
     std::wcout << L"default_keys_path: " << default_keys_path << L"\n";
-    CHECK_DIR_EXIST(default_keys_path);
+    CHECK_FILE_EXIST(default_keys_path);
     for (size_t i = 0; i < user_config_paths.size(); i++) {
         std::wcout << L"user_config_path: [ " << i << " ] " << user_config_paths[i] << L"\n";
     }
@@ -243,6 +244,7 @@ void verify_paths(){
     CHECK_DIR_EXIST(shader_path);
 
 #undef CHECK_DIR_EXIST
+#undef CHECK_FILE_EXIST
 }
 
 std::mutex mupdf_mutexes[FZ_LOCK_MAX];