浏览代码

platform: reset network on invalid power events

世界 1 年之前
父节点
当前提交
e2d3862e64
共有 1 个文件被更改,包括 1 次插入6 次删除
  1. 1 6
      experimental/libbox/service_pause.go

+ 1 - 6
experimental/libbox/service_pause.go

@@ -13,33 +13,28 @@ type servicePauseFields struct {
 func (s *BoxService) Pause() {
 func (s *BoxService) Pause() {
 	s.pauseAccess.Lock()
 	s.pauseAccess.Lock()
 	defer s.pauseAccess.Unlock()
 	defer s.pauseAccess.Unlock()
-
 	if s.pauseTimer != nil {
 	if s.pauseTimer != nil {
 		s.pauseTimer.Stop()
 		s.pauseTimer.Stop()
 	}
 	}
-
 	s.pauseTimer = time.AfterFunc(time.Minute, s.pause)
 	s.pauseTimer = time.AfterFunc(time.Minute, s.pause)
 }
 }
 
 
 func (s *BoxService) pause() {
 func (s *BoxService) pause() {
 	s.pauseAccess.Lock()
 	s.pauseAccess.Lock()
 	defer s.pauseAccess.Unlock()
 	defer s.pauseAccess.Unlock()
-
 	s.pauseManager.DevicePause()
 	s.pauseManager.DevicePause()
 	_ = s.instance.Router().ResetNetwork()
 	_ = s.instance.Router().ResetNetwork()
 	s.pauseTimer = nil
 	s.pauseTimer = nil
 }
 }
 
 
 func (s *BoxService) Wake() {
 func (s *BoxService) Wake() {
+	_ = s.instance.Router().ResetNetwork()
 	s.pauseAccess.Lock()
 	s.pauseAccess.Lock()
 	defer s.pauseAccess.Unlock()
 	defer s.pauseAccess.Unlock()
-
 	if s.pauseTimer != nil {
 	if s.pauseTimer != nil {
 		s.pauseTimer.Stop()
 		s.pauseTimer.Stop()
 		s.pauseTimer = nil
 		s.pauseTimer = nil
 		return
 		return
 	}
 	}
-
 	s.pauseManager.DeviceWake()
 	s.pauseManager.DeviceWake()
-	_ = s.instance.Router().ResetNetwork()
 }
 }