Segmentation fault during manual merge

[Linus Torvalds]

On Thu, Dec 6, 2012 at 9:45 AM, Sergey Starosek
<sergey.starosek at gmail.com> wrote:
>
> Trying to do manual merge of two dives results in segfault.

Ugh. All the dives I tried that on had the dive computer information..

Does this trivial patch fix it for you?

              Linus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch.diff
Type: application/octet-stream
Size: 450 bytes
Desc: not available
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20121206/42b10ff4/attachment.obj>