oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/Shout: remove unnecessary nullptr check

Browse Source
This commit is contained in:
Max Kellermann
2017-08-08 18:47:02 +02:00
parent 06c7e55188
commit d22361f7c7
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/output/plugins/ShoutOutputPlugin.cxx
View File

@@ -299,17 +299,15 @@ write_page(ShoutOutput *sd)
void void
ShoutOutput::Close() ShoutOutput::Close()
{ {
if (encoder != nullptr) { try {
try { encoder->End();
encoder->End(); write_page(this);
write_page(this); } catch (const std::runtime_error &) {
} catch (const std::runtime_error &) { /* ignore */
/* ignore */
}
delete encoder;
} }
delete encoder;
if (shout_get_connected(shout_conn) != SHOUTERR_UNCONNECTED && if (shout_get_connected(shout_conn) != SHOUTERR_UNCONNECTED &&
shout_close(shout_conn) != SHOUTERR_SUCCESS) { shout_close(shout_conn) != SHOUTERR_SUCCESS) {
FormatWarning(shout_output_domain, FormatWarning(shout_output_domain,