From 5ad5570c7de7e328236c4c14a9864ce48e51aa73 Mon Sep 17 00:00:00 2001 From: Nonoo Date: Tue, 11 May 2021 08:10:26 +0200 Subject: [PATCH] Fix panic on tune stop after the timeout --- civcontrol.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/civcontrol.go b/civcontrol.go index 28dc440..13d3fa5 100644 --- a/civcontrol.go +++ b/civcontrol.go @@ -532,7 +532,10 @@ func (s *civControlStruct) decodeTransmitStatus(d []byte) bool { } else { if s.state.tune { // Tune finished? s.state.tune = false - s.state.tuneTimeoutTimer.Stop() + if s.state.tuneTimeoutTimer != nil { + s.state.tuneTimeoutTimer.Stop() + s.state.tuneTimeoutTimer = nil + } _ = s.getVd() } } @@ -1024,6 +1027,7 @@ func (s *civControlStruct) setTune(enable bool) error { if enable { b = 2 s.state.tuneTimeoutTimer = time.AfterFunc(tuneTimeout, func() { + s.state.tuneTimeoutTimer = nil _ = s.setTune(false) }) } else {