From 0c84532e3355704b68d0e2d5977b1e80cf5c04e5 Mon Sep 17 00:00:00 2001
From: athatheo <vostidi@hotmail.com>
Date: Sat, 6 Apr 2019 18:06:02 +0300
Subject: [PATCH] Reduced scope of eventActionDefinitionIDexists variable

---
 src/Services/EventActionService.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index 487c2cd4..bdcad7f0 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -82,11 +82,11 @@ void EventActionService::enableEventActionDefinitions(Message& message) {
 	uint16_t numberOfEventActionDefinitions = message.readUint16();
 	if (numberOfEventActionDefinitions != 0) {
 		for (uint16_t i = 0; i < numberOfEventActionDefinitions; i++) {
-			bool eventActionDefinitionIDexists = false;
 			message.skipBytes(2);
 			uint16_t eventDefinitionID = message.readEnum16();
 			uint16_t eventActionDefinitionID = message.readEnum16();
 			if (eventActionDefinitionMap.find(eventDefinitionID) != eventActionDefinitionMap.end()) {
+				bool eventActionDefinitionIDexists = false;
 				auto range = eventActionDefinitionMap.equal_range(eventDefinitionID);
 				for (auto& element = range.first; element != range.second; ++element) {
 					if (element->second.eventActionDefinitionID == eventActionDefinitionID){
@@ -116,11 +116,11 @@ void EventActionService::disableEventActionDefinitions(Message& message) {
 	uint16_t numberOfEventActionDefinitions = message.readUint16();
 	if (numberOfEventActionDefinitions != 0) {
 		for (uint16_t i = 0; i < numberOfEventActionDefinitions; i++) {
-			bool eventActionDefinitionIDexists = false;
 			message.skipBytes(2);
 			uint16_t eventDefinitionID = message.readEnum16();
 			uint16_t eventActionDefinitionID = message.readEnum16();
 			if (eventActionDefinitionMap.find(eventDefinitionID) != eventActionDefinitionMap.end()) {
+				bool eventActionDefinitionIDexists = false;
 				auto range = eventActionDefinitionMap.equal_range(eventDefinitionID);
 				for (auto& element = range.first; element != range.second; ++element) {
 					if (element->second.eventActionDefinitionID == eventActionDefinitionID){
-- 
GitLab