mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make sure memory for default_dive_computer_device is allocated

Browse source 
When calling gtk-gui.c:set_default_dive_computer_device(), first
free memory at default_dive_computer_device and then use strdup().

This fixed a case, where after selecting a device for the first time
in the "Download" dialog, then pressing "OK" followed by "Cancel"
(after a device error) the device text is garbled the next time the
dialog is opened.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2012-09-22 19:07:50 +03:00
parent c4c636fb4f
commit 921bc51c87
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gtk-gui.c
View file

@ -70,7 +70,9 @@ static void set_default_dive_computer_device(const char *name)
return; return;
if (is_default_dive_computer_device(name)) if (is_default_dive_computer_device(name))
return; return;
default_dive_computer_device = name; if (default_dive_computer_device)
free((void *)default_dive_computer_device);
default_dive_computer_device = strdup(name);
subsurface_set_conf("dive_computer_device", PREF_STRING, name); subsurface_set_conf("dive_computer_device", PREF_STRING, name);
} }
@ -1105,6 +1107,8 @@ void exit_ui(void)
free((char *)default_filename); free((char *)default_filename);
if (existing_filename) if (existing_filename)
free((void *)existing_filename); free((void *)existing_filename);
if (default_dive_computer_device)
free((void *)default_dive_computer_device);
} }
typedef struct { typedef struct {