From 68b5e7b5176ea4733b689f42185d9091828cfb21 Mon Sep 17 00:00:00 2001
From: Ben Payne <bpayne@beamng.com>
Date: Tue, 11 Nov 2014 15:15:11 -0500
Subject: [PATCH] Fix more use-after-delete errors

---
 Engine/source/environment/decalRoad.cpp | 4 ++--
 Engine/source/environment/meshRoad.cpp  | 2 +-
 Engine/source/environment/river.cpp     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Engine/source/environment/decalRoad.cpp b/Engine/source/environment/decalRoad.cpp
index 7bd240095..3cde83149 100644
--- a/Engine/source/environment/decalRoad.cpp
+++ b/Engine/source/environment/decalRoad.cpp
@@ -155,8 +155,8 @@ void DecalRoadNodeEvent::padListToSize()
       newlist->mPositions.merge(list->mPositions);
       newlist->mWidths.merge(list->mWidths);
 
-      mNodeList = newlist;
       delete list;
+      mNodeList = list = newlist;
    }
 
    // Pad our list end?
@@ -1726,4 +1726,4 @@ DefineEngineMethod( DecalRoad, postApply, void, (),,
                   )
 {
    object->inspectPostApply();
-}
\ No newline at end of file
+}
diff --git a/Engine/source/environment/meshRoad.cpp b/Engine/source/environment/meshRoad.cpp
index 453250568..1c6e7a693 100644
--- a/Engine/source/environment/meshRoad.cpp
+++ b/Engine/source/environment/meshRoad.cpp
@@ -203,8 +203,8 @@ void MeshRoadNodeEvent::padListToSize()
       newlist->mDepths.merge(list->mDepths);
       newlist->mNormals.merge(list->mNormals);
 
-      mNodeList = newlist;
       delete list;
+      mNodeList = list = newlist;
    }
 
    // Pad our list end?
diff --git a/Engine/source/environment/river.cpp b/Engine/source/environment/river.cpp
index 59a16230f..bf9b9671f 100644
--- a/Engine/source/environment/river.cpp
+++ b/Engine/source/environment/river.cpp
@@ -227,8 +227,8 @@ void RiverNodeEvent::padListToSize()
       newlist->mDepths.merge(list->mDepths);
       newlist->mNormals.merge(list->mNormals);
 
-      mNodeList = newlist;
       delete list;
+      mNodeList = list = newlist;
    }
 
    // Pad our list end?