From f044e2b57fd65423cacba36f9eac7bb3568b477c Mon Sep 17 00:00:00 2001 From: Sour Date: Sun, 7 Jan 2018 09:44:43 -0500 Subject: [PATCH] Fixed uninitialized variable accesses --- Core/BaseApuChannel.h | 1 + Core/Console.h | 2 +- Core/SoundMixer.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/BaseApuChannel.h b/Core/BaseApuChannel.h index 603a0f2d..c8e6c304 100644 --- a/Core/BaseApuChannel.h +++ b/Core/BaseApuChannel.h @@ -31,6 +31,7 @@ public: { _channel = channel; _mixer = mixer; + _nesModel = NesModel::NTSC; Reset(false); } diff --git a/Core/Console.h b/Core/Console.h index 9bff4be1..a49d1920 100644 --- a/Core/Console.h +++ b/Core/Console.h @@ -51,7 +51,7 @@ class Console unique_ptr _hdData; unique_ptr _hdAudioDevice; - NesModel _model; + NesModel _model = NesModel::NTSC; string _romFilepath; string _patchFilename; diff --git a/Core/SoundMixer.cpp b/Core/SoundMixer.cpp index 87acc400..c5886b46 100644 --- a/Core/SoundMixer.cpp +++ b/Core/SoundMixer.cpp @@ -25,6 +25,7 @@ SoundMixer::SoundMixer() _blipBufRight = blip_new(SoundMixer::MaxSamplesPerFrame); _sampleRate = EmulationSettings::GetSampleRate(); _model = NesModel::NTSC; + _clockRate = CPU::GetClockRate(_model); Reset(); }