From 2dfecdb85f33b33ffb5cdf3f2c86c2adca003660 Mon Sep 17 00:00:00 2001
From: Alayan <alayan.feh@gmail.com>
Date: Sun, 7 Oct 2018 15:36:25 +0200
Subject: [PATCH] Fix #3488

---
 src/graphics/slip_stream.cpp | 2 +-
 src/karts/kart.cpp           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/graphics/slip_stream.cpp b/src/graphics/slip_stream.cpp
index 46c7e1d5e..be8b1af0d 100644
--- a/src/graphics/slip_stream.cpp
+++ b/src/graphics/slip_stream.cpp
@@ -363,7 +363,7 @@ SP::SPMesh* SlipStream::createMesh(Material* material, bool bonus_mesh)
 //----------------------------------------------------------------------------- */
 void SlipStream::updateSlipstreamingTextures(float f, const AbstractKart *kart)
 {
-    if (!kart || !m_node || !m_node_fast)
+    if (!kart || kart->isEliminated() || !m_node || !m_node_fast)
     {
         if (m_node)
         {
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index bdd6c650e..926c93a20 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1309,6 +1309,11 @@ void Kart::eliminate()
         m_attachment->clear();
     }
 
+    if (m_slipstream)
+    {
+        m_slipstream->reset();
+    }
+
     m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_TERRAIN, 0);
     m_kart_gfx->setGFXInvisible();
     if (m_engine_sound)