mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-09 18:25:58 +01:00
Code Activity

Ensure autolocked groups are locked on creation.

Browse source 
We used to autolock groups when the last user left, but not
when creating a group that was not in memory yet.  Ensure that
groups are autolocked in all cases.

Thanks to Michael Ströder.
This commit is contained in:
Juliusz Chroboczek 2022-09-22 17:30:48 +02:00
parent b20cb0e523
commit 62517844a5
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -1,5 +1,7 @@
Galene 0.6.1 (unreleased): Galene 0.6.1 (unreleased):
* Ensure that autolocked groups are locked on creation. Thanks to
Michael Ströder.
* Add a camera/microphone indicator in the users list. * Add a camera/microphone indicator in the users list.
* Hide audio-only peers by default. * Hide audio-only peers by default.

10
group/group.go
View file

@ -433,20 +433,16 @@ func add(name string, desc *Description) (*Group, []Client, error) {
timestamp: time.Now(), timestamp: time.Now(),
} }
groups.groups[name] = g groups.groups[name] = g
return g, nil, nil
} }
g.mu.Lock() g.mu.Lock()
defer g.mu.Unlock() defer g.mu.Unlock()
if desc != nil { if desc != nil {
if descriptionMatch(g.description, desc) { if !descriptionMatch(g.description, desc) {
return g, nil, nil g.description = desc
} }
g.description = desc } else if !descriptionUnchanged(name, g.description) {
} else if descriptionUnchanged(name, g.description) {
return g, nil, nil
} else {
desc, err = readDescription(name) desc, err = readDescription(name)
if err != nil { if err != nil {
if !os.IsNotExist(err) { if !os.IsNotExist(err) {