fly/flightgear
1
0
Fork 0
Code Activity

Fixed iteration bug in destructor.

Browse source
This commit is contained in:
david 2003-01-21 02:08:56 +00:00
parent fbcfbd9355
commit 0940afae5a
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/GUI/menubar.cxx
View file

@ -286,6 +286,7 @@ FGMenuBar::~FGMenuBar ()
// Delete all the character arrays // Delete all the character arrays
// we were forced to keep around for // we were forced to keep around for
// plib. // plib.
std::cerr << "Deleting char arrays\n";
for (i = 0; i < _char_arrays.size(); i++) { for (i = 0; i < _char_arrays.size(); i++) {
for (int j = 0; _char_arrays[i][j] != 0; j++) for (int j = 0; _char_arrays[i][j] != 0; j++)
free(_char_arrays[i][j]); // added with strdup free(_char_arrays[i][j]); // added with strdup
@ -295,16 +296,21 @@ FGMenuBar::~FGMenuBar ()
// Delete all the callback arrays // Delete all the callback arrays
// we were forced to keep around for // we were forced to keep around for
// plib. // plib.
std::cerr << "Deleting callback arrays\n";
for (i = 0; i < _callback_arrays.size(); i++) for (i = 0; i < _callback_arrays.size(); i++)
delete _callback_arrays[i]; delete _callback_arrays[i];
// Delete all those bindings // Delete all those bindings
std::cerr << "Deleting bindings\n";
map<string,vector<FGBinding *> >::iterator it; map<string,vector<FGBinding *> >::iterator it;
it = _bindings.begin(); it = _bindings.begin();
while (it != _bindings.end()) { for (it = _bindings.begin(); it != _bindings.end(); it++) {
std::cerr << "Deleting bindings for " << it->first << std::endl;
for (int i = 0; i < it->second.size(); i++) for (int i = 0; i < it->second.size(); i++)
delete it->second[i]; delete it->second[i];
} }
std::cerr << "Done.\n";
} }
void void
@ -346,8 +352,9 @@ FGMenuBar::fireItem (puObject * item)
{ {
const char * name = item->getLegend(); const char * name = item->getLegend();
vector<FGBinding *> &bindings = _bindings[name]; vector<FGBinding *> &bindings = _bindings[name];
int nBindings = bindings.size();
for (int i = 0; i < bindings.size(); i++) for (int i = 0; i < nBindings; i++)
bindings[i]->fire(); bindings[i]->fire();
} }