Merge pull request #62 from skitt/package-name

Add the package name to the icons and ui paths
ashaduri · Jun 11, 2024 · f9a098d · f9a098d
2 parents 25f1c62 + 3324e27
commit f9a098d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/gui/gsc_init.cpp b/src/gui/gsc_init.cpp
@@ -473,8 +473,8 @@ bool app_init_and_loop(int& argc, char**& argv)
 			hz::data_file_add_search_directory("ui", application_dir / "ui");
 			hz::data_file_add_search_directory("doc", application_dir / "doc");
 		} else {
-			hz::data_file_add_search_directory("icons", hz::fs_path_from_string(BuildEnv::package_pkgdata_dir()) / "icons");  // /usr/share/program_name/icons
-			hz::data_file_add_search_directory("ui", hz::fs_path_from_string(BuildEnv::package_pkgdata_dir()) / "ui");  // /usr/share/program_name/ui
+			hz::data_file_add_search_directory("icons", hz::fs_path_from_string(BuildEnv::package_pkgdata_dir()) / BuildEnv::package_name() / "icons");  // /usr/share/program_name/icons
+			hz::data_file_add_search_directory("ui", hz::fs_path_from_string(BuildEnv::package_pkgdata_dir()) / BuildEnv::package_name() / "ui");  // /usr/share/program_name/ui
 			hz::data_file_add_search_directory("doc", hz::fs_path_from_string(BuildEnv::package_doc_dir()));  // /usr/share/doc/[packages/]gsmartcontrol
 		}
 	}