projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6ebc31
)
Fix a few places where a complete ERROR message was not being sent.
author
Carl Hetherington
<cth@carlh.net>
Mon, 30 May 2022 12:41:22 +0000
(14:41 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 8 Jun 2022 20:20:58 +0000
(22:20 +0200)
src/tools/dcpomatic_disk_writer.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_disk_writer.cc
b/src/tools/dcpomatic_disk_writer.cc
index cfb610f0a14bd3e07b70ed82515d8ed9e92daac2..dca09f729ad0ee37bbd4e12906ceac98d4fe146a 100644
(file)
--- a/
src/tools/dcpomatic_disk_writer.cc
+++ b/
src/tools/dcpomatic_disk_writer.cc
@@
-177,13
+177,19
@@
try
"com.dcpomatic.write-drive",
[xml]() {
bool const success = Drive(xml).unmount();
"com.dcpomatic.write-drive",
[xml]() {
bool const success = Drive(xml).unmount();
- if (!nanomsg->send(success ? (DISK_WRITER_OK "\n") : (DISK_WRITER_ERROR "\n"), LONG_TIMEOUT)) {
+ bool sent_reply = false;
+ if (success) {
+ sent_reply = nanomsg->send(DISK_WRITER_OK "\n", LONG_TIMEOUT);
+ } else {
+ sent_reply = nanomsg->send(DISK_WRITER_ERROR "\nCould not unmount drive\n1\n", LONG_TIMEOUT);
+ }
+ if (!sent_reply) {
LOG_DISK_NC("CommunicationFailedError in unmount_finished");
throw CommunicationFailedError ();
}
},
[]() {
LOG_DISK_NC("CommunicationFailedError in unmount_finished");
throw CommunicationFailedError ();
}
},
[]() {
- if (!nanomsg->send(DISK_WRITER_ERROR "\n", LONG_TIMEOUT)) {
+ if (!nanomsg->send(DISK_WRITER_ERROR "\n
Could not get permission to unmount drive\n1\n
", LONG_TIMEOUT)) {
LOG_DISK_NC("CommunicationFailedError in unmount_finished");
throw CommunicationFailedError ();
}
LOG_DISK_NC("CommunicationFailedError in unmount_finished");
throw CommunicationFailedError ();
}
@@
-266,7
+272,7
@@
try
},
[]() {
if (nanomsg) {
},
[]() {
if (nanomsg) {
- nanomsg->send(DISK_WRITER_ERROR "\nCould not obtain authorization to write to the drive\n", LONG_TIMEOUT);
+ nanomsg->send(DISK_WRITER_ERROR "\nCould not obtain authorization to write to the drive\n
1\n
", LONG_TIMEOUT);
}
});
}
}
});
}