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

decoder/Thread: std::throw_with_nested() to wrap caught exception

Browse Source
This commit is contained in:
Max Kellermann 2016-09-08 20:47:18 +02:00
parent be5d629c13
commit a1e9678b69
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/decoder/DecoderThread.cxx
View File

@ -361,25 +361,14 @@ try {
: decoder_run_stream(decoder, real_uri); : decoder_run_stream(decoder, real_uri);
} catch (StopDecoder) { } catch (StopDecoder) {
return true; return true;
} catch (const std::runtime_error &e) { } catch (...) {
/* copy the exception to decoder.error */
if (decoder.error.IsDefined()) {
/* decoder.error already set, now we have a second
one; only log the second one */
LogError(e);
return false;
}
const char *error_uri = real_uri; const char *error_uri = real_uri;
const std::string allocated = uri_remove_auth(error_uri); const std::string allocated = uri_remove_auth(error_uri);
if (!allocated.empty()) if (!allocated.empty())
error_uri = allocated.c_str(); error_uri = allocated.c_str();
decoder.error.Format(decoder_domain, std::throw_with_nested(FormatRuntimeError("Failed to decode %s",
"Failed to decode %s: %s", error_uri));
error_uri, e.what());
return false;
} }
/** /**