On Wed, Feb 15, 2017 at 5:01 PM, Linus Torvalds
<[email protected]> wrote:
>
> Let me check if just fixing that one line fixes it.
Yes, that seems to be the only problem. I didn't actually verify what
the end result of the merge looked like, but it didn't crash and
seemed generally happy.
Trivial patch attached
Linus
core/dive.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/dive.c b/core/dive.c
index 3dcfebc3..2c699fb9 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -3139,7 +3139,7 @@ struct dive *merge_dives(struct dive *a, struct dive *b,
int offset, bool prefer
dl = b;
}
- if (!strcmp(a->dc.model, "planneed dive")) {
+ if (same_string(a->dc.model, "planned dive")) {
struct dive *tmp = a;
a = b;
b = tmp;
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
