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

Rename event: correctly replace event with new one

Browse source 
I don't like that the event structure includes the variable length array.
That really makes it a pain to change the name of an event (on the flip
side, freeing events is easier I guess).

Anyway, to correctly rename an event we need to actually remove the event
from the correct dc and then add a new event with the new name. The
previous code was insane (it only worked if the new name was of smaller or
equal length, otherwise it had a beautiful buffer overflow).

And of course we need to do this both for the current_dive and the
displayed_dive.

Fixes #616

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-12 12:48:27 -07:00
parent f9b18b9bfb
commit 74616cdddf
3 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/profile/profilewidget2.cpp
View file

@ -1093,10 +1093,14 @@ void ProfileWidget2::editName()
lengthWarning.exec();
return;
}
strcpy(event->name, newName.toUtf8());
remember_event(event->name);
// order is important! first update the current dive (by matching the unchanged event),
// then update the displayed dive (as event is part of the events on displayed dive
// and will be freed as part of changing the name!
update_event_name(current_dive, event, newName.toUtf8().data());
update_event_name(&displayed_dive, event, newName.toUtf8().data());
mark_divelist_changed(true);
replot();
}
replot();
}
void ProfileWidget2::disconnectTemporaryConnections()