Fix: more than one closing of done channel

olebedev · Mar 24, 2016 · 3e7ff9a · 3e7ff9a
1 parent 8f03f14
commit 3e7ff9a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/emitter.go b/emitter.go
@@ -252,16 +252,15 @@ func (e *Emitter) Emit(topic string, args ...interface{}) chan struct{} {
 			}
 		}
 
-		if haveToWait {
-			go func(done chan struct{}) {
-				defer func() { recover() }()
-				wg.Wait()
-				close(done)
-			}(done)
-		} else {
+	}
+	if haveToWait {
+		go func(done chan struct{}) {
+			defer func() { recover() }()
+			wg.Wait()
 			close(done)
-		}
-
+		}(done)
+	} else {
+		close(done)
 	}
 
 	e.mu.Unlock()

diff --git a/emitter_test.go b/emitter_test.go
@@ -286,6 +286,13 @@ func TestSync(t *testing.T) {
 	expect(t, isOpened, true)
 	_, isOpened = <-pipe2
 	expect(t, isOpened, false)
+
+	// void
+	ee = New(0)
+	ee.Once("*", Void)
+	ee.On("test:void", Void, func(e *Event) {
+	})
+	<-ee.Emit("test:void")
 }
 
 func expect(t *testing.T, a interface{}, b interface{}) {