diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-30 15:21:58 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-30 15:21:58 +0200 |
| commit | 7c6b291860fd415f79067fc7058f11ffa58fdf10 (patch) | |
| tree | 15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/audio/MusicManager.cpp | |
| parent | Reactivated Store(Restore)StuffIn(From)Mem, fixed bugs (diff) | |
| parent | Merge pull request #78 from ShFil119/cleanup (diff) | |
| download | re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.gz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.bz2 re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.lz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.xz re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.tar.zst re3-7c6b291860fd415f79067fc7058f11ffa58fdf10.zip | |
Diffstat (limited to 'src/audio/MusicManager.cpp')
| -rw-r--r-- | src/audio/MusicManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 6f2d3d86..7b7c1182 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -55,7 +55,7 @@ void cMusicManager::DisplayRadioStationName() if (!CTimer::GetIsPaused() && !TheCamera.m_WideScreenOn && cMusicManager::PlayerInCar() && !CReplay::IsPlayingBack()) { if (MusicManager.m_bPlayerInCar && !MusicManager.m_bPreviousPlayerInCar) - pCurrentStation = nullptr; + pCurrentStation = nil; if (cSampleManager.IsMP3RadioChannelAvailable()) { gStreamedSound = MusicManager.m_nCurrentStreamedSound; @@ -103,7 +103,7 @@ void cMusicManager::DisplayRadioStationName() } } - wchar *string = nullptr; + wchar *string = nil; switch (pRetune) { case HEAD_RADIO: |