iridium/neko-custom
Archived
2
0
Fork 0
Code Pull Requests Activity

Merge branch 'screen-size-bug' of github.com:m1k1o/neko into dev

Browse Source
This commit is contained in:
Miroslav Šedivý 2020-06-16 15:29:49 +02:00
commit e80f258ae2
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/internal/remote/manager.go
View File

@ -102,11 +102,9 @@ func (manager *RemoteManager) StartStream() {
if !xorg.ValidScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) { if !xorg.ValidScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) {
manager.logger.Warn().Msgf("invalid screen option %dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) manager.logger.Warn().Msgf("invalid screen option %dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)
} else { } else if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil {
if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil {
manager.logger.Warn().Err(err).Msg("unable to change screen size") manager.logger.Warn().Err(err).Msg("unable to change screen size")
} }
}
manager.createPipelines() manager.createPipelines()
manager.video.Start() manager.video.Start()

10
server/internal/websocket/session.go
View File

@ -12,11 +12,6 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
return err return err
} }
// send screen current resolution
if err := h.screenResolution(id, session); err != nil {
return err
}
if session.Admin() { if session.Admin() {
// send screen configurations if admin // send screen configurations if admin
if err := h.screenConfigurations(id, session); err != nil { if err := h.screenConfigurations(id, session); err != nil {
@ -37,6 +32,11 @@ func (h *MessageHandler) SessionConnected(id string, session types.Session) erro
return err return err
} }
// send screen current resolution
if err := h.screenResolution(id, session); err != nil {
return err
}
// tell session there is a host // tell session there is a host
host, ok := h.sessions.GetHost() host, ok := h.sessions.GetHost()
if ok { if ok {