Fix typo in particle spawning

[dragonfireclient.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 929ed0eabdab48358a9c20841b164f802e4e47cd..e4ca52dd5b3b81c16a90a18ea6be98f98e7f95ec 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -350,6 +350,11 @@ Client::~Client()
        m_mesh_update_thread.setRun(false);
        while(m_mesh_update_thread.IsRunning())
                sleep_ms(100);
+       while(!m_mesh_update_thread.m_queue_out.empty()) {
+               MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_front();
+               delete r.mesh;
+       }
+
 
        delete m_inventory_from_server;
 
@@ -757,6 +762,8 @@ void Client::step(float dtime)
 
                                // Replace with the new mesh
                                block->mesh = r.mesh;
+                       } else {
+                               delete r.mesh;
                        }
                        if(r.ack_block_to_server)
                        {
@@ -1980,7 +1987,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
                event.spawn_particle.expirationtime = expirationtime;
                event.spawn_particle.size = size;
-               event.add_particlespawner.collisiondetection =
+               event.spawn_particle.collisiondetection =
                                collisiondetection;
                event.spawn_particle.texture = new std::string(texture);