Skip to content
Snippets Groups Projects
Commit c0530921 authored by Perttu Ahola's avatar Perttu Ahola
Browse files

Attempt to fix some minor memory leaks

parent 94f1ab4d
No related branches found
No related tags found
No related merge requests found
......@@ -537,6 +537,14 @@ Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
Connection::~Connection()
{
stop();
// Delete peers
for(core::map<u16, Peer*>::Iterator
j = m_peers.getIterator();
j.atEnd() == false; j++)
{
Peer *peer = j.getNode()->getValue();
delete peer;
}
}
/* Internal stuff */
......
......@@ -290,8 +290,11 @@ class CItemDefManager: public IWritableItemDefManager
// Ensure that the "" item (the hand) always has ToolCapabilities
if(def.name == "")
assert(def.tool_capabilities != NULL);
m_item_definitions[def.name] = new ItemDefinition(def);
if(m_item_definitions.count(def.name) == 0)
m_item_definitions[def.name] = new ItemDefinition(def);
else
*(m_item_definitions[def.name]) = def;
// Remove conflicting alias if it exists
bool alias_removed = (m_aliases.erase(def.name) != 0);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment