Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix emergemanager memory leaks
  • Loading branch information
sapier authored and kwolekr committed Apr 9, 2013
1 parent 04c3b17 commit 7d002b6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 15 additions & 1 deletion src/emerge.cpp
Expand Up @@ -96,9 +96,23 @@ EmergeManager::~EmergeManager() {
delete emergethread[i];
delete mapgen[i];
}
emergethread.clear();

for (unsigned int i = 0; i < mapgen.size(); i++)
delete mapgen[i];
mapgen.clear();

for (unsigned int i = 0; i < ores.size(); i++)
delete ores[i];
ores.clear();

for (std::map<std::string, MapgenFactory *>::iterator iter = mglist.begin();
iter != mglist.end(); iter ++) {
delete iter->second;
}
mglist.clear();

delete biomedef;
delete params;
}


Expand Down
2 changes: 2 additions & 0 deletions src/map.cpp
Expand Up @@ -2494,6 +2494,8 @@ ServerMap::~ServerMap()
delete chunk;
}
#endif

delete m_mgparams;
}

bool ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)
Expand Down

0 comments on commit 7d002b6

Please sign in to comment.