From 483cef87d491eb2a4331aa02bc710810b6490862 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Mon, 18 Jan 2021 12:16:27 +0000
Subject: [PATCH] Fix 3872ee43b5 and 768c84aa46

Tested by: @Langbart
Fixes: #5934

Differential Revision: https://code.wildfiregames.com/D3409
This was SVN commit r24682.
---
 source/gui/ObjectBases/IGUIObject.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/gui/ObjectBases/IGUIObject.cpp b/source/gui/ObjectBases/IGUIObject.cpp
index d6c9b5fad4..9585d5ca2e 100644
--- a/source/gui/ObjectBases/IGUIObject.cpp
+++ b/source/gui/ObjectBases/IGUIObject.cpp
@@ -31,6 +31,7 @@
 #include "scriptinterface/ScriptInterface.h"
 #include "soundmanager/ISoundManager.h"
 
+#include <algorithm>
 #include <unordered_map>
 
 const CStr IGUIObject::EventNameMouseEnter = "MouseEnter";
@@ -349,7 +350,8 @@ void IGUIObject::SetScriptHandler(const CStr& eventName, JS::HandleObject Functi
 
 	m_ScriptHandlers[eventName] = JS::Heap<JSObject*>(Function);
 
-	m_pGUI.m_EventObjects[eventName].push_back(this);
+	if (std::find(m_pGUI.m_EventObjects[eventName].begin(), m_pGUI.m_EventObjects[eventName].end(), this) == m_pGUI.m_EventObjects[eventName].end())
+		m_pGUI.m_EventObjects[eventName].emplace_back(this);
 }
 
 void IGUIObject::UnsetScriptHandler(const CStr& eventName)