From 0d2e89af32c22c877af1f661d1a707e9c1b32e6b Mon Sep 17 00:00:00 2001
From: Nomango <569629550@qq.com>
Date: Sun, 8 Oct 2017 23:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=AA=E8=83=BD=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E3=80=81=E5=81=9C=E6=AD=A2=E3=80=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=9C=BA=E6=99=AF=E4=B8=8A=E7=9A=84=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Easy2D/Msg/KeyMsg.cpp   | 6 +++---
 Easy2D/Msg/MouseMsg.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Easy2D/Msg/KeyMsg.cpp b/Easy2D/Msg/KeyMsg.cpp
index f123ff20..347a519a 100644
--- a/Easy2D/Msg/KeyMsg.cpp
+++ b/Easy2D/Msg/KeyMsg.cpp
@@ -149,7 +149,7 @@ void KeyMsg::startListener(TString name)
 	// 查找名称相同的监听器
 	for (auto l : s_vListeners)
 	{
-		if (l->m_sName == name)
+		if (l->m_sName == name && l->m_pParentScene == App::getCurrentScene())
 		{
 			l->start();
 		}
@@ -161,7 +161,7 @@ void KeyMsg::stopListener(TString name)
 	// 查找名称相同的监听器
 	for (auto l : s_vListeners)
 	{
-		if (l->m_sName == name)
+		if (l->m_sName == name && l->m_pParentScene == App::getCurrentScene())
 		{
 			l->stop();
 		}
@@ -176,7 +176,7 @@ void KeyMsg::delListener(TString name)
 	for (iter = s_vListeners.begin(); iter != s_vListeners.end();)
 	{
 		// 查找相同名称的监听器
-		if ((*iter)->m_sName == name)
+		if ((*iter)->m_sName == name && (*iter)->m_pParentScene == App::getCurrentScene())
 		{
 			// 删除该定时器
 			delete (*iter);
diff --git a/Easy2D/Msg/MouseMsg.cpp b/Easy2D/Msg/MouseMsg.cpp
index 5594b7be..e225439e 100644
--- a/Easy2D/Msg/MouseMsg.cpp
+++ b/Easy2D/Msg/MouseMsg.cpp
@@ -68,7 +68,7 @@ void MouseMsg::startListener(TString name)
 	// 查找名称相同的监听器
 	for (auto l : s_vListeners)
 	{
-		if (l->m_sName == name)
+		if (l->m_sName == name && l->m_pParentScene == App::getCurrentScene())
 		{
 			l->start();
 		}
@@ -80,7 +80,7 @@ void MouseMsg::stopListener(TString name)
 	// 查找名称相同的监听器
 	for (auto l : s_vListeners)
 	{
-		if (l->m_sName == name)
+		if (l->m_sName == name && l->m_pParentScene == App::getCurrentScene())
 		{
 			l->stop();
 		}
@@ -95,7 +95,7 @@ void MouseMsg::delListener(TString name)
 	for (iter = s_vListeners.begin(); iter != s_vListeners.end();)
 	{
 		// 查找相同名称的监听器
-		if ((*iter)->m_sName == name)
+		if ((*iter)->m_sName == name && (*iter)->m_pParentScene == App::getCurrentScene())
 		{
 			// 删除该定时器
 			delete (*iter);