X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fmenubar.cxx;h=89246a5ede79a1a6c68478c7af8aa4748a6be86e;hb=ebdeb3eed386199d9d54f819ba3c472b501ae6f7;hp=3cd03bbcc494022e4b02184e63487f91da6b20fa;hpb=91976472206ba8319cc41cd3ff468fec04a52a78;p=flightgear.git diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx index 3cd03bbcc..89246a5ed 100644 --- a/src/GUI/menubar.cxx +++ b/src/GUI/menubar.cxx @@ -258,7 +258,7 @@ FGMenuBar::destroy_menubar () // Delete all the character arrays // we were forced to keep around for // plib. - SG_LOG(SG_GENERAL, SG_INFO, "Deleting char arrays"); + SG_LOG(SG_GENERAL, SG_BULK, "Deleting char arrays"); for (i = 0; i < _char_arrays.size(); i++) { for (int j = 0; _char_arrays[i][j] != 0; j++) free(_char_arrays[i][j]); // added with strdup @@ -268,20 +268,20 @@ FGMenuBar::destroy_menubar () // Delete all the callback arrays // we were forced to keep around for // plib. - SG_LOG(SG_GENERAL, SG_INFO, "Deleting callback arrays"); + SG_LOG(SG_GENERAL, SG_BULK, "Deleting callback arrays"); for (i = 0; i < _callback_arrays.size(); i++) delete[] _callback_arrays[i]; // Delete all those bindings - SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings"); + SG_LOG(SG_GENERAL, SG_BULK, "Deleting bindings"); map >::iterator it; for (it = _bindings.begin(); it != _bindings.end(); it++) { - SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings for " << it->first); + SG_LOG(SG_GENERAL, SG_BULK, "Deleting bindings for " << it->first); for ( i = 0; i < it->second.size(); i++ ) delete it->second[i]; } - SG_LOG(SG_GENERAL, SG_INFO, "Done."); + SG_LOG(SG_GENERAL, SG_BULK, "Done."); } void @@ -356,7 +356,7 @@ FGMenuBar::add_enabled_listener(SGPropertyNode * node) bool FGMenuBar::enable_item(const SGPropertyNode * node, bool state) { - const char *path = node->getPath(); + string path = node->getPath(); if (_objects.find(path) == _objects.end()) { SG_LOG(SG_GENERAL, SG_ALERT, "Trying to enable/disable " "non-existent menu item for node `" << path << '\'');