Merge pull request #7 from stampzilla/stamp/panic-fix

Changed interlocks in Disconnect method
stampzilla · Feb 21, 2019 · 0a779e5 · 0a779e5
2 parents d0c2faf + b686ff3
commit 0a779e5
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/device_connection.go b/device_connection.go
@@ -119,23 +119,19 @@ func (d *Device) connect() error {
 }
 
 func (d *Device) Disconnect() {
+	d.Lock()
 	if d.conn != nil {
-		d.RLock()
 		for _, subscription := range d.subscriptions {
 			subscription.Handler.Disconnect()
 		}
-		d.RUnlock()
 
-		d.Lock()
 		d.subscriptions = make(map[string]*Subscription, 0)
 		d.Dispatch(events.Disconnected{})
 
 		d.conn.Close()
 		d.conn = nil
-		d.Unlock()
 	}
 
-	d.Lock()
 	d.connected = false
 	d.Unlock()
 }