lib: ostream-wrapper - Call output_finished() callback when wrapper stream is finishe...

Before, it would only be called when the parent output is also fully flushed,
which is too late.

diff --git a/src/lib/ostream-wrapper.c b/src/lib/ostream-wrapper.c
index dfd669946fb3cf8481facdd24fabf4c1a65229a0..79d2ccb3c1558289e63cd80b6eb19ee26123249e 100644 (file)
--- a/src/lib/ostream-wrapper.c
+++ b/src/lib/ostream-wrapper.c
@@ -922,9 +922,9 @@ static int wrapper_ostream_flush(struct ostream_private *stream)
                }
        } while (ret == 0 && stream->ostream.blocking);
 
-       if (ret > 0 && stream->finished) {
+       if (stream->finished && ret >= 0 &&
+           wrapper_ostream_is_empty(wostream)) {
                /* This was an o_stream_finish() call or subsequent flush */
-               i_assert(wrapper_ostream_is_empty(wostream));
                while ((ret = wrapper_ostream_finish(wostream)) == 0) {
                        if (!stream->ostream.blocking) {
                                /* Not yet finished completely */