From c89123f30519dbf28223c49c0708c50cbe6b8501 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Fri, 15 Mar 2019 17:28:20 +0100
Subject: [PATCH] fix: propagating mod.started and mod.stopped events

---
 modules/events_stream/events_view.go | 10 ++++++----
 session/module.go                    | 10 ++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/events_stream/events_view.go b/modules/events_stream/events_view.go
index abe3ffdd..c529db58 100644
--- a/modules/events_stream/events_view.go
+++ b/modules/events_stream/events_view.go
@@ -66,10 +66,12 @@ func (mod *EventsStream) viewEndpointEvent(e session.Event) {
 }
 
 func (mod *EventsStream) viewModuleEvent(e session.Event) {
-	fmt.Fprintf(mod.output, "[%s] [%s] %s\n",
-		e.Time.Format(mod.timeFormat),
-		tui.Green(e.Tag),
-		e.Data)
+	if *mod.Session.Options.Debug {
+		fmt.Fprintf(mod.output, "[%s] [%s] %s\n",
+			e.Time.Format(mod.timeFormat),
+			tui.Green(e.Tag),
+			e.Data)
+	}
 }
 
 func (mod *EventsStream) viewSnifferEvent(e session.Event) {
diff --git a/session/module.go b/session/module.go
index fda87b06..5accba3d 100644
--- a/session/module.go
+++ b/session/module.go
@@ -186,12 +186,10 @@ func (m *SessionModule) SetRunning(running bool, cb func()) error {
 	m.Started = running
 	m.StatusLock.Unlock()
 
-	if *m.Session.Options.Debug {
-		if running {
-			m.Session.Events.Add("mod.started", m.Name)
-		} else {
-			m.Session.Events.Add("mod.stopped", m.Name)
-		}
+	if running {
+		m.Session.Events.Add("mod.started", m.Name)
+	} else {
+		m.Session.Events.Add("mod.stopped", m.Name)
 	}
 
 	if cb != nil {