birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes a crash with UI interaction (#1567)

Browse Source 
When Wwise Gem is not enabled, this will fix a nullptr deref crash when
interacting with Audio Controls Editor.

Also fixes another issue in the same function where getting the current
level name was garbage because a temporary QString was created and
immediately destructed.
This commit is contained in:
Eric Phister
2021-06-24 15:53:56 -05:00
committed by GitHub
parent 273b2c30b7
commit 5d79ee593d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
+10 -4
View File
@@ -290,6 +290,12 @@ namespace AudioControls
//-------------------------------------------------------------------------------------------//
void CAudioControlsEditorWindow::UpdateAudioSystemData()
{
IAudioSystemEditor* audioSystemImpl = CAudioControlsEditorPlugin::GetAudioSystemEditorImpl();
if (!audioSystemImpl)
{
return;
}
Audio::SAudioRequest oConfigDataRequest;
oConfigDataRequest.nFlags = Audio::eARF_PRIORITY_HIGH;
@@ -310,17 +316,17 @@ namespace AudioControls
oConfigDataRequest.pData = &oParseGlobalRequestData;
Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, oConfigDataRequest);
//parse the AudioSystem level-specific config data
const char* levelName = GetIEditor()->GetLevelName().toUtf8().data();
// parse the AudioSystem level-specific config data
AZStd::string levelName{ GetIEditor()->GetLevelName().toUtf8().data() };
AZ::StringFunc::Path::Join(sControlsPath.c_str(), "levels", sControlsPath);
AZ::StringFunc::Path::Join(sControlsPath.c_str(), levelName, sControlsPath);
AZ::StringFunc::Path::Join(sControlsPath.c_str(), levelName.c_str(), sControlsPath);
Audio::SAudioManagerRequestData<Audio::eAMRT_PARSE_CONTROLS_DATA> oParseLevelRequestData(sControlsPath.c_str(), Audio::eADS_LEVEL_SPECIFIC);
oConfigDataRequest.pData = &oParseLevelRequestData;
Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequest, oConfigDataRequest);
// inform the middleware specific plugin that the data has been saved
// to disk (in case it needs to update something)
CAudioControlsEditorPlugin::GetAudioSystemEditorImpl()->DataSaved();
audioSystemImpl->DataSaved();
}
//-------------------------------------------------------------------------------------------//