Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crash hotfix (no clang-format because on phone)

Browse source 
hotfix 2: check if the texture is custom before dumping

hotfix 4: fix custom texture conflict detection
This commit is contained in:
Khangaroo 2019-08-17 09:15:18 -04:00 • committed by James Rowe
parent ae4aaf2fc1
commit 5450d4980d
5 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/citra_qt/configuration/configure_enhancements.cpp
View file

@ -99,9 +99,6 @@ void ConfigureEnhancements::ApplyConfiguration() {
Settings::values.swap_screen = ui->swap_screen->isChecked();
Settings::values.dump_textures = ui->toggle_dump_textures->isChecked();
Settings::values.custom_textures = ui->toggle_custom_textures->isChecked();
auto& custom_tex_cache = Core::System::GetInstance().CustomTexCache();
if (Settings::values.custom_textures && custom_tex_cache.IsTexturePathMapEmpty())
custom_tex_cache.FindCustomTextures();
Settings::values.preload_textures = ui->toggle_preload_textures->isChecked();
Settings::values.bg_red = static_cast<float>(bg_color.redF());
Settings::values.bg_green = static_cast<float>(bg_color.greenF());