From 590a108a1b964c611534007b280f12f88747cc8e Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Tue, 30 Mar 2021 11:19:56 +0200
Subject: [PATCH] Fix IW4 zone loading

---
 src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp   |  2 +-
 .../Loading/Steps/StepRemoveProcessor.cpp           | 13 +------------
 src/ZoneLoading/Loading/Steps/StepRemoveProcessor.h |  2 --
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp b/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp
index 24d325a7..a5ba798e 100644
--- a/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp
+++ b/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp
@@ -137,8 +137,8 @@ class ZoneLoaderFactory::Impl
         auto* masterBlockHashesPtr = masterBlockHashes.get();
         zoneLoader->AddLoadingStep(std::move(masterBlockHashes));
 
-        zoneLoader->AddLoadingStep(std::make_unique<StepRemoveProcessor>(subHeaderCapturePtr));
         zoneLoader->AddLoadingStep(std::make_unique<StepVerifyHash>(std::unique_ptr<IHashFunction>(Crypto::CreateSHA256()), 0, subHeaderHashPtr, subHeaderCapturePtr));
+        zoneLoader->AddLoadingStep(std::make_unique<StepRemoveProcessor>(subHeaderCapturePtr));
 
         // Skip the rest of the first chunk
         zoneLoader->AddLoadingStep(std::make_unique<StepSkipBytes>(ZoneConstants::AUTHED_CHUNK_SIZE - sizeof(DB_AuthHeader)));
diff --git a/src/ZoneLoading/Loading/Steps/StepRemoveProcessor.cpp b/src/ZoneLoading/Loading/Steps/StepRemoveProcessor.cpp
index 6e47f97e..343bce18 100644
--- a/src/ZoneLoading/Loading/Steps/StepRemoveProcessor.cpp
+++ b/src/ZoneLoading/Loading/Steps/StepRemoveProcessor.cpp
@@ -2,25 +2,14 @@
 #include <cassert>
 
 StepRemoveProcessor::StepRemoveProcessor(StreamProcessor* streamProcessor)
-    : m_stream_processor(streamProcessor),
-      m_removed(false)
+    : m_stream_processor(streamProcessor)
 {
 }
 
-StepRemoveProcessor::~StepRemoveProcessor()
-{
-    if(m_removed)
-    {
-        delete m_stream_processor;
-        m_stream_processor = nullptr;
-    }
-}
-
 void StepRemoveProcessor::PerformStep(ZoneLoader* zoneLoader, ILoadingStream* stream)
 {
     assert(zoneLoader != nullptr);
     assert(m_stream_processor != nullptr);
 
     zoneLoader->RemoveStreamProcessor(m_stream_processor);
-    m_removed = true;
 }
diff --git a/src/ZoneLoading/Loading/Steps/StepRemoveProcessor.h b/src/ZoneLoading/Loading/Steps/StepRemoveProcessor.h
index 89aeb734..8049bad5 100644
--- a/src/ZoneLoading/Loading/Steps/StepRemoveProcessor.h
+++ b/src/ZoneLoading/Loading/Steps/StepRemoveProcessor.h
@@ -5,11 +5,9 @@
 class StepRemoveProcessor final : public ILoadingStep
 {
     StreamProcessor* m_stream_processor;
-    bool m_removed;
 
 public:
     explicit StepRemoveProcessor(StreamProcessor* streamProcessor);
-    ~StepRemoveProcessor() override;
 
     void PerformStep(ZoneLoader* zoneLoader, ILoadingStream* stream) override;
 };