diff options
| author |  Morph | 2022-10-17 02:56:38 -0400 |
|---|---|---|
| committer |  GitHub | 2022-10-17 02:56:38 -0400 |
| commit | f107e58fde1e52bc33fe3e1104b0fa9e3648c77f (patch) | |
| tree | d28a28a893c7eaf3b7358daaf9af0d08875702c7 /src | |
| parent | Merge pull request #9058 from Docteh/new_transifex_cli (diff) | |
| parent | sdl2_sink: Inline variable init into if condition (diff) | |
| download | yuzu-f107e58fde1e52bc33fe3e1104b0fa9e3648c77f.tar.gz yuzu-f107e58fde1e52bc33fe3e1104b0fa9e3648c77f.tar.xz yuzu-f107e58fde1e52bc33fe3e1104b0fa9e3648c77f.zip | |
Merge pull request #9080 from lat9nq/sdl-audio-not-null
sdl2_sink: Avoid loading a null string into a vector
Diffstat (limited to '')
| -rw-r--r-- | src/audio_core/sink/sdl2_sink.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index f12ebf7fe..c138dc628 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp | |||
| @@ -230,7 +230,9 @@ std::vector<std::string> ListSDLSinkDevices(bool capture) { | |||
| 230 | 230 | ||
| 231 | const int device_count = SDL_GetNumAudioDevices(capture); | 231 | const int device_count = SDL_GetNumAudioDevices(capture); |
| 232 | for (int i = 0; i < device_count; ++i) { | 232 | for (int i = 0; i < device_count; ++i) { |
| 233 | device_list.emplace_back(SDL_GetAudioDeviceName(i, 0)); | 233 | if (const char* name = SDL_GetAudioDeviceName(i, capture)) { |
| 234 | device_list.emplace_back(name); | ||
| 235 | } | ||
| 234 | } | 236 | } |
| 235 | 237 | ||
| 236 | return device_list; | 238 | return device_list; |