Adding safeguards around Shutdown and AddTarget

chromedp · Mar 13, 2017 · ddaa7bc · ddaa7bc
1 parent 8c9e75e
commit ddaa7bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,8 @@ massif.out
 
 # binaries
 /chromedp-gen
+/chromedp-proxy
+/chromedp-cli
 /cmd/chromedp-gen/chromedp-gen
+/cmd/chromedp-gen/chromedp-proxy
+/cmd/chromedp-gen/chromedp-cli
diff --git a/chromedp.go b/chromedp.go
@@ -75,6 +75,9 @@ func New(ctxt context.Context, opts ...Option) (*CDP, error) {
 
 	go func() {
 		for t := range c.watch {
+			if t == nil {
+				return
+			}
 			go c.AddTarget(ctxt, t)
 		}
 	}()
@@ -153,7 +156,11 @@ func (c *CDP) Shutdown(ctxt context.Context, opts ...client.Option) error {
 	c.RLock()
 	defer c.RUnlock()
 
-	return c.r.Shutdown(ctxt, opts...)
+	if c.r != nil {
+		return c.r.Shutdown(ctxt, opts...)
+	}
+
+	return nil
 }
 
 // ListTargets returns the target IDs of the managed targets.