From 9eb70a299947cf1e6e7bf2a1a83a583130070251 Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Thu, 11 Feb 2016 16:57:28 +0100
Subject: [PATCH] My pull request got merged :3

---
 deps/Wink-Signals                       | 2 +-
 generate.bat                            | 1 -
 src/Components/Modules/AssetHandler.cpp | 2 +-
 src/Components/Modules/Dedicated.cpp    | 2 +-
 src/Components/Modules/Dvar.cpp         | 2 +-
 src/Components/Modules/QuickPatch.cpp   | 2 +-
 src/Components/Modules/Renderer.cpp     | 4 +---
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/deps/Wink-Signals b/deps/Wink-Signals
index 7fde542d..a42886b6 160000
--- a/deps/Wink-Signals
+++ b/deps/Wink-Signals
@@ -1 +1 @@
-Subproject commit 7fde542d24a7fa0cdac23fbd093f9bd60b9c2c52
+Subproject commit a42886b61d4469d6d1b2932374bbfdab065ebe06
diff --git a/generate.bat b/generate.bat
index b6d22cc3..782e5e3c 100644
--- a/generate.bat
+++ b/generate.bat
@@ -1,3 +1,2 @@
 @echo off
-call tools\protogen.bat
 premake5 %* vs2015
\ No newline at end of file
diff --git a/src/Components/Modules/AssetHandler.cpp b/src/Components/Modules/AssetHandler.cpp
index e9e4546f..3a443a80 100644
--- a/src/Components/Modules/AssetHandler.cpp
+++ b/src/Components/Modules/AssetHandler.cpp
@@ -275,7 +275,7 @@ namespace Components
 		}
 
 		AssetHandler::AssetInterfaces.clear();
-		//AssetHandler::RestrictSignal.clear();
+		AssetHandler::RestrictSignal.clear();
 		AssetHandler::TypeCallbacks.clear();
 	}
 }
diff --git a/src/Components/Modules/Dedicated.cpp b/src/Components/Modules/Dedicated.cpp
index c1ed3d0d..6e00ad9b 100644
--- a/src/Components/Modules/Dedicated.cpp
+++ b/src/Components/Modules/Dedicated.cpp
@@ -245,6 +245,6 @@ namespace Components
 
 	Dedicated::~Dedicated()
 	{
-		//Dedicated::FrameSignal.clear();
+		Dedicated::FrameSignal.clear();
 	}
 }
diff --git a/src/Components/Modules/Dvar.cpp b/src/Components/Modules/Dvar.cpp
index 4878f3e1..bbb95e22 100644
--- a/src/Components/Modules/Dvar.cpp
+++ b/src/Components/Modules/Dvar.cpp
@@ -202,6 +202,6 @@ namespace Components
 
 	Dvar::~Dvar()
 	{
-		//Dvar::RegistrationSignal.clear();
+		Dvar::RegistrationSignal.clear();
 	}
 }
diff --git a/src/Components/Modules/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp
index 011f9cb0..242b8025 100644
--- a/src/Components/Modules/QuickPatch.cpp
+++ b/src/Components/Modules/QuickPatch.cpp
@@ -203,6 +203,6 @@ namespace Components
 
 	QuickPatch::~QuickPatch()
 	{
-		//QuickPatch::ShutdownSignal.clear();
+		QuickPatch::ShutdownSignal.clear();
 	}
 }
diff --git a/src/Components/Modules/Renderer.cpp b/src/Components/Modules/Renderer.cpp
index b1b3bbb4..7580ea84 100644
--- a/src/Components/Modules/Renderer.cpp
+++ b/src/Components/Modules/Renderer.cpp
@@ -43,8 +43,6 @@ namespace Components
 	Renderer::~Renderer()
 	{
 		Renderer::DrawFrameHook.Uninstall();
-
-		// As I don't want to include my fork as submodule, we have to wait till my pull request gets accepted in order to do this.
-		//Renderer::FrameSignal.clear();
+		Renderer::FrameSignal.clear();
 	}
 }