Project activity refactoring and listeners improvements

1 files changed, 4 insertions, 1 deletions

diff --git a/app/Core/Event.php b/app/Core/Event.php
index 0e6df5e8..a32499d8 100644
--- a/app/Core/Event.php
+++ b/app/Core/Event.php
@@ -69,11 +69,14 @@ class Event
     {
         if (! $this->isEventTriggered($eventName)) {
 
-            $this->lastEvent = $eventName;
             $this->events[] = $eventName;
 
             if (isset($this->listeners[$eventName])) {
+
                 foreach ($this->listeners[$eventName] as $listener) {
+
+                    $this->lastEvent = $eventName;
+
                     if ($listener->execute($data)) {
                         $this->lastListener = get_class($listener);
                     }