NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-10 06:06:47 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fix a couple of display registration bugs.

Browse Source
This commit is contained in:
Patrick Fairbank
2018-09-22 22:12:54 -07:00
parent aeec870e3f
commit 4c775e90ea
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
field/display.go
View File

@@ -147,7 +147,7 @@ func (arena *Arena) RegisterDisplay(display *Display) {
defer displayRegistryMutex.Unlock()
existingDisplay, ok := arena.Displays[display.Id]
if ok && display.Type == PlaceholderDisplay && existingDisplay.Type != PlaceholderDisplay {
if ok && display.Type == PlaceholderDisplay {
// Don't rewrite the registered configuration if the new one is a placeholder -- if it is reconnecting after a
// restart, it should adopt the existing configuration.
arena.Displays[display.Id].ConnectionCount++
@@ -184,8 +184,15 @@ func (arena *Arena) MarkDisplayDisconnected(display *Display) {
displayRegistryMutex.Lock()
defer displayRegistryMutex.Unlock()
if display, ok := arena.Displays[display.Id]; ok {
display.ConnectionCount -= 1
arena.DisplayConfigurationNotifier.Notify()
if existingDisplay, ok := arena.Displays[display.Id]; ok {
if existingDisplay.Type == PlaceholderDisplay && existingDisplay.Nickname == "" &&
len(existingDisplay.Configuration) == 0 {
// If the display is an unconfigured placeholder, just remove it entirely to prevent clutter.
delete(arena.Displays, existingDisplay.Id)
} else {
existingDisplay.ConnectionCount -= 1
arena.DisplayConfigurationNotifier.Notify()
}
}
}