summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-11-21 02:32:08 +0100
committerCarl Hetherington <cth@carlh.net>2020-11-21 02:32:08 +0100
commitb636c3e0323a60526c450c2fd821289c1363f5d2 (patch)
tree6c1f077137e33d24a3d0bf28f7270f1805feb0de /src
parent12608503f0acbba54acc804f61f0cf605ec221dd (diff)
Better equality-failure error messages.
Diffstat (limited to 'src')
-rw-r--r--src/reel.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/reel.cc b/src/reel.cc
index 29ce9038..918349c1 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -185,7 +185,13 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHand
return false;
}
- if (_main_markers && (!other->_main_markers || !_main_markers->equals (other->_main_markers, opt, note))) {
+ if ((_main_markers && !other->_main_markers) || (!_main_markers && other->_main_markers)) {
+ note (DCP_ERROR, "Reel: one has markers and the other does not");
+ return false;
+ }
+
+ if (_main_markers && !_main_markers->equals(other->_main_markers, opt, note)) {
+ note (DCP_ERROR, "Reel: marker assets differ");
return false;
}