Recover better errors from ext4.

[dcpomatic.git] / src / lib / disk_writer_messages.cc

diff --git a/src/lib/disk_writer_messages.cc b/src/lib/disk_writer_messages.cc
index a862f2fc6f52b2756ac3d58520b6bf705cdba533..7bccdd9fc18ad3b9d4bc16afafcf93d22e1bf7d4 100644 (file)
--- a/src/lib/disk_writer_messages.cc
+++ b/src/lib/disk_writer_messages.cc
@@ -41,7 +41,8 @@ DiskWriterBackEndResponse::read_from_nanomsg(Nanomsg& nanomsg, int timeout)
        } else if (*s == DISK_WRITER_ERROR) {
                auto const m = nanomsg.receive(500);
                auto const n = nanomsg.receive(500);
-               return DiskWriterBackEndResponse::error(m.get_value_or(""), dcp::raw_convert<int>(n.get_value_or("0")));
+               auto const p = nanomsg.receive(500);
+               return DiskWriterBackEndResponse::error(m.get_value_or(""), dcp::raw_convert<int>(n.get_value_or("0")), dcp::raw_convert<int>(p.get_value_or("0")));
        } else if (*s == DISK_WRITER_PONG) {
                return DiskWriterBackEndResponse::pong();
        } else if (*s == DISK_WRITER_FORMAT_PROGRESS) {
@@ -73,7 +74,7 @@ DiskWriterBackEndResponse::write_to_nanomsg(Nanomsg& nanomsg, int timeout) const
                        message = String::compose("%1\n", DISK_WRITER_OK);
                        break;
                case Type::ERROR:
-                       message = String::compose("%1\n%2\n%3\n", DISK_WRITER_ERROR, _error_message, _error_number);
+                       message = String::compose("%1\n%2\n%3\n%4\n", DISK_WRITER_ERROR, _error_message, _ext4_error_number, _platform_error_number);
                        break;
                case Type::PONG:
                        message = String::compose("%1\n", DISK_WRITER_PONG);