Skip to content

Commit 958ee71

Browse files
committed
fix: add nil check for xsManager in tryToChangeScaleFactor
fix a broken bug Log: fix a broken bug pms: TASK-369021
1 parent 50862d0 commit 958ee71

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

display1/manager.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3083,14 +3083,18 @@ func (m *Manager) tryToChangeScaleFactor(monitorWidth, monitorHeight uint16) {
30833083
return
30843084
}
30853085

3086+
if m.xsManager == nil {
3087+
return
3088+
}
3089+
30863090
curScale, err := m.xsManager.GetScaleFactor(0)
30873091
if err != nil {
30883092
logger.Warning("failed to get scale factor:", err)
30893093
return
30903094
}
30913095

30923096
maxScale := calcMaxScaleFactor(monitorWidth, monitorHeight)
3093-
if curScale > maxScale && m.xsManager != nil {
3097+
if curScale > maxScale {
30943098
recommendScaleFactor := scale.GetRecommendedScaleFactor(m.xConn)
30953099
// 更新scale factor
30963100
m.xsManager.SetScaleFactor(0, recommendScaleFactor)

0 commit comments

Comments
 (0)