mirror of
https://github.com/PabloMK7/citra.git
synced 2025-11-03 07:08:48 +00:00
Chore: Enable warnings as errors on MSVC (#6456)
* tests: add Sanity test for SplitFilename83 fix test fix test * disable `C4715:not all control paths return a value` for nihstro includes nihstro: no warn * Chore: Enable warnings as errors on msvc + fix warnings fixes some more warnings clang-format * more fixes * Externals: Add target_compile_options `/W0` nihstro-headers and ... Revert "disable `C4715:not all control paths return a value` for nihstro includes" This reverts commit 606d79b55d3044b744fb835025b8eb0f4ea5b757. * src\citra\config.cpp: ReadSetting: simplify type casting * settings.cpp: Get*Name: remove superflous logs
This commit is contained in:
parent
055a58f01e
commit
41f13456c0
71 changed files with 397 additions and 294 deletions
|
|
@ -290,14 +290,14 @@ bool CustomTexManager::Decode(Material* material, std::function<bool()>&& upload
|
|||
|
||||
void CustomTexManager::ReadConfig(const std::string& load_path) {
|
||||
const std::string config_path = load_path + "pack.json";
|
||||
FileUtil::IOFile file{config_path, "r"};
|
||||
if (!file.IsOpen()) {
|
||||
FileUtil::IOFile config_file{config_path, "r"};
|
||||
if (!config_file.IsOpen()) {
|
||||
LOG_INFO(Render, "Unable to find pack config file, using legacy defaults");
|
||||
refuse_dds = true;
|
||||
return;
|
||||
}
|
||||
std::string config(file.GetSize(), '\0');
|
||||
const std::size_t read_size = file.ReadBytes(config.data(), config.size());
|
||||
std::string config(config_file.GetSize(), '\0');
|
||||
const std::size_t read_size = config_file.ReadBytes(config.data(), config.size());
|
||||
if (!read_size) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue