summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorFernando S <fsahmkow27@gmail.com>2023-04-24 12:36:52 +0200
committerGitHub <noreply@github.com>2023-04-24 12:36:52 +0200
commit47cd0586ee6ee28c05307df79821f855d9d0ee2d (patch)
treeeeb2e702d9e9f535ac819689f1a8fee564b1a54f /src/core/hle
parentMerge pull request #10069 from liamwhite/log (diff)
parentcore: audio: return result when audio_out initialize failed (diff)
downloadyuzu-47cd0586ee6ee28c05307df79821f855d9d0ee2d.tar
yuzu-47cd0586ee6ee28c05307df79821f855d9d0ee2d.tar.gz
yuzu-47cd0586ee6ee28c05307df79821f855d9d0ee2d.tar.bz2
yuzu-47cd0586ee6ee28c05307df79821f855d9d0ee2d.tar.lz
yuzu-47cd0586ee6ee28c05307df79821f855d9d0ee2d.tar.xz
yuzu-47cd0586ee6ee28c05307df79821f855d9d0ee2d.tar.zst
yuzu-47cd0586ee6ee28c05307df79821f855d9d0ee2d.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/audio/audout_u.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index 23b8be993..3e62fa4fc 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -49,12 +49,6 @@ public:
};
// clang-format on
RegisterHandlers(functions);
-
- if (impl->GetSystem()
- .Initialize(device_name, in_params, handle, applet_resource_user_id)
- .IsError()) {
- LOG_ERROR(Service_Audio, "Failed to initialize the AudioOut System!");
- }
}
~IAudioOut() override {
@@ -287,6 +281,14 @@ void AudOutU::OpenAudioOut(HLERequestContext& ctx) {
auto audio_out = std::make_shared<IAudioOut>(system, *impl, new_session_id, device_name,
in_params, handle, applet_resource_user_id);
+ result = audio_out->GetImpl()->GetSystem().Initialize(device_name, in_params, handle,
+ applet_resource_user_id);
+ if (result.IsError()) {
+ LOG_ERROR(Service_Audio, "Failed to initialize the AudioOut System!");
+ IPC::ResponseBuilder rb{ctx, 2};
+ rb.Push(result);
+ return;
+ }
impl->sessions[new_session_id] = audio_out->GetImpl();
impl->applet_resource_user_ids[new_session_id] = applet_resource_user_id;