Skip to content

Commit 544af97

Browse files
lichangzeKT-lcz
authored andcommitted
fix: 规避休眠会多一个displaylink显示器问题
由于休眠唤醒后没有移除monitor信号,导致会多一个monitor,所以移除原来的判断条件,遍历原有的monitor,移除不存在的 Log: 规避待机会多一个displaylink显示器问题 Bug: https://pms.uniontech.com/bug-view-174637.html Influence: displaylink Change-Id: I4de93dba64e442cad59d5c9d04670c78e0886d6e
1 parent e6c167a commit 544af97

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

display/xorg.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,14 @@ func (mm *xMonitorManager) doDiff() {
392392
}
393393
}
394394
newMap := toMonitorInfoMap(newMonitors)
395-
if len(newMonitors) < len(oldMonitors) {
396-
for k, monitor := range oldMonitors {
397-
_, ok := newMap[k]
398-
if !ok {
399-
// 需要移除的monitor
400-
mm.mu.Unlock()
401-
mm.hooks.handleMonitorRemoved(monitor.ID)
402-
mm.mu.Lock()
403-
}
395+
for k, monitor := range oldMonitors {
396+
_, ok := newMap[k]
397+
if !ok {
398+
// 需要移除的monitor
399+
mm.mu.Unlock()
400+
logger.Info("remove monitor:", monitor.ID)
401+
mm.hooks.handleMonitorRemoved(monitor.ID)
402+
mm.mu.Lock()
404403
}
405404
}
406405
}

0 commit comments

Comments
 (0)