Skip to content

Commit ebe7b31

Browse files
t0suj4kwolekr
authored andcommittedAug 2, 2015
src/client.cpp: Fix mapper memory leak
1 parent 42cf5e9 commit ebe7b31

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed
 

‎src/client.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ Client::~Client()
291291

292292
m_mesh_update_thread.Stop();
293293
m_mesh_update_thread.Wait();
294-
while(!m_mesh_update_thread.m_queue_out.empty()) {
294+
while (!m_mesh_update_thread.m_queue_out.empty()) {
295295
MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
296296
delete r.mesh;
297297
}
@@ -300,20 +300,22 @@ Client::~Client()
300300
delete m_inventory_from_server;
301301

302302
// Delete detached inventories
303-
for(std::map<std::string, Inventory*>::iterator
303+
for (std::map<std::string, Inventory*>::iterator
304304
i = m_detached_inventories.begin();
305-
i != m_detached_inventories.end(); i++){
305+
i != m_detached_inventories.end(); ++i) {
306306
delete i->second;
307307
}
308308

309309
// cleanup 3d model meshes on client shutdown
310310
while (m_device->getSceneManager()->getMeshCache()->getMeshCount() != 0) {
311-
scene::IAnimatedMesh * mesh =
311+
scene::IAnimatedMesh *mesh =
312312
m_device->getSceneManager()->getMeshCache()->getMeshByIndex(0);
313313

314314
if (mesh != NULL)
315315
m_device->getSceneManager()->getMeshCache()->removeMesh(mesh);
316316
}
317+
318+
delete m_mapper;
317319
}
318320

319321
void Client::connect(Address address,

0 commit comments

Comments
 (0)
Please sign in to comment.