From f8b9c8fa6dfbbeab22016f795911ffa00bb09854 Mon Sep 17 00:00:00 2001 From: meepingsnesroms Date: Tue, 26 Dec 2017 05:31:51 -0800 Subject: [PATCH] Fix csnd corrupting dsp audio driver on failure, add 3dsx/smdh to gitignore --- .gitignore | 2 ++ frontend/drivers/platform_ctr.c | 9 ++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a55e30e1b2..b5e65384aa 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,8 @@ wiiu/wut/elf2rpl/elf2rpl # 3ds /.lst +*.3dsx +*.smdh # Ctags /tags diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index 1aeee71a80..1deb9c25cb 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -358,16 +358,11 @@ static void frontend_ctr_init(void *data) } osSetSpeedupEnable(true); - audio_driver_t* dsp_audio_driver = &audio_ctr_dsp; if(csndInit() != 0) - { - dsp_audio_driver = &audio_ctr_csnd; - audio_ctr_csnd = audio_ctr_dsp; - audio_ctr_dsp = audio_null; - } + audio_ctr_csnd = audio_null; ctr_check_dspfirm(); if(ndspInit() != 0) - *dsp_audio_driver = audio_null; + audio_ctr_dsp = audio_null; cfguInit(); #endif }