mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix dive site string merging

Browse source 
If the second dive site doesn't have a particular string, but the first
one does, we did the wrong thing and created a result string like

   (first dive site string) or ((null))

which is not useful.  We should just use the first dive site string
as-is.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2017-02-19 17:20:09 -08:00 • committed by Dirk Hohndel
parent 6e40a510c6
commit 2e77a22e2c
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/divesite.c
View file

@ -275,6 +275,9 @@ static void merge_string(char **a, char **b)
{ {
char *s1 = *a, *s2 = *b; char *s1 = *a, *s2 = *b;
if (!s2)
return;
if (same_string(s1, s2)) if (same_string(s1, s2))
return; return;