diff --git a/src/config.cpp b/src/config.cpp index c7a859b1..66b5b52a 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -76,10 +76,6 @@ static void enumerate_config_files(std::vector& paths) { paths.push_back(config_dir + mangohud_dir + "MangoHud.conf"); -#ifdef _WIN32 - paths.push_back("C:\\mangohud\\MangoHud.conf"); -#endif - if (!program_name.empty()) { paths.push_back(config_dir + mangohud_dir + program_name + ".conf"); } @@ -105,7 +101,9 @@ void parseConfigFile(overlay_params& params) { paths.push_back(cfg_file); else enumerate_config_files(paths); - +#ifdef _WIN32 + paths.push_back("C:\\mangohud\\MangoHud.conf"); +#endif std::string line; for (auto p = paths.rbegin(); p != paths.rend(); p++) { std::ifstream stream(*p); diff --git a/src/vulkan.cpp b/src/vulkan.cpp index cd71e1b2..42142222 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -426,11 +426,12 @@ static void snapshot_swapchain_frame(struct swapchain_data *data) struct instance_data *instance_data = device_data->instance; update_hud_info(data->sw_stats, instance_data->params, device_data->properties.vendorID); check_keybinds(data->sw_stats, instance_data->params, device_data->properties.vendorID); - +#ifdef __linux__ if (instance_data->params.control >= 0) { control_client_check(device_data); process_control_socket(instance_data); } +#endif } static void compute_swapchain_display(struct swapchain_data *data) diff --git a/src/win/d3d_shared.cpp b/src/win/d3d_shared.cpp index b473b6b3..c15fc94d 100644 --- a/src/win/d3d_shared.cpp +++ b/src/win/d3d_shared.cpp @@ -14,7 +14,7 @@ void init_d3d_shared(){ if (cfg_inited) return; parse_overlay_config(¶ms, getenv("MANGOHUD_CONFIG")); - _params = params; + _params = ¶ms; cfg_inited = true; // init_cpu_stats(params); }