Seperate event and error channels for Subscriber

1 files changed, 4 insertions, 5 deletions

diff --git a/main.go b/main.go
index e2cd130..1e4c15e 100644
--- a/main.go
+++ b/main.go
@@ -45,11 +45,11 @@ func handleEvents(events *bspc.Subscriber, bar *bar.Handle) (chan error, chan bo
 	reload := make(chan bool)
 
 	go func(){ for {
-		event = <-events.Event
-
-		if event.Err != nil {
-			errors <- event.Err
+		select {
+		case err := <-events.Err:
+			errors <- err
 			return
+		case event = <- events.Event:
 		}
 
 		if strings.HasPrefix(event.Name, "monitor_") {
@@ -115,7 +115,6 @@ func main() {
 			}
 
 			barhandle.NewState <- state
-
 		case err := <- everr:
 			common.Error("Couldn't read event: %s\n", err)
 			return