From 980501768f9b37d581ffa5ccdeb9615798f3b76f Mon Sep 17 00:00:00 2001 From: milek7 Date: Sat, 2 Apr 2022 15:29:50 +0200 Subject: [PATCH] dsbBuzzer null check fiasco --- Train.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Train.cpp b/Train.cpp index b9c2c77d..3acfba05 100644 --- a/Train.cpp +++ b/Train.cpp @@ -7889,9 +7889,8 @@ TTrain::update_sounds( double const Deltatime ) { if( mvOccupied->Power24vIsAvailable || mvOccupied->Power110vIsAvailable ) { // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa // hunter-091012: rozdzielenie alarmow - if (dsbBuzzer && mvOccupied->SecuritySystem.is_beeping()) { - - if( false == dsbBuzzer->is_playing() ) { + if( mvOccupied->SecuritySystem.is_beeping() ) { + if( dsbBuzzer && false == dsbBuzzer->is_playing() ) { dsbBuzzer->pitch( dsbBuzzer->m_frequencyoffset + dsbBuzzer->m_frequencyfactor ); dsbBuzzer->gain( dsbBuzzer->m_amplitudeoffset + dsbBuzzer->m_amplitudefactor ); dsbBuzzer->play( sound_flags::looping ); @@ -7901,7 +7900,7 @@ TTrain::update_sounds( double const Deltatime ) { } } else { - if( true == dsbBuzzer->is_playing() ) { + if( dsbBuzzer && true == dsbBuzzer->is_playing() ) { dsbBuzzer->stop(); #ifdef _WIN32 Console::BitsClear( 1 << 14 ); // ustawienie bitu 16 na PoKeys