output/Shout: remove unnecessary nullptr check

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

View File

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