Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-fix #2449 #2477

Merged
merged 9 commits into from Sep 30, 2021
Merged

Re-fix #2449 #2477

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e9ec0d1
Make fireChange() public
nullst Sep 16, 2021
8cfce11
Fix #2449 by retrying ignored changes
nullst Sep 16, 2021
45cef25
Formatting fix
nullst Sep 18, 2021
c0a1ecd
Add a comment to exported function FireChange
nullst Sep 18, 2021
137ccdd
Avoid tautological preferences update after loading file
nullst Sep 24, 2021
3ebbfec
Comments about the changes suspension/suppression mechanism
nullst Sep 24, 2021
cc816b7
Renamed .ignoreChange variable to better reflect the role it plays
nullst Sep 26, 2021
267f052
Call save() directly instead of going through change listeners
nullst Sep 26, 2021
df48b37
Restore internal/preferences.go to the original state
nullst Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/preferences.go
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ type preferences struct {

prefLock sync.RWMutex
ignoreChange bool
numIgnoredChanges int

app *fyneApp
}
Expand All @@ -28,7 +29,13 @@ func (p *preferences) resetIgnore() {
time.Sleep(time.Millisecond * 100) // writes are not always atomic. 10ms worked, 100 is safer.
p.prefLock.Lock()
p.ignoreChange = false
changes := p.numIgnoredChanges
p.numIgnoredChanges = 0
p.prefLock.Unlock()

if changes > 0 {
p.InMemoryPreferences.FireChange()
}
}()
}

Expand Down Expand Up @@ -112,9 +119,12 @@ func newPreferences(app *fyneApp) *preferences {
}

p.AddChangeListener(func() {
p.prefLock.RLock()
p.prefLock.Lock()
shouldIgnoreChange := p.ignoreChange
p.prefLock.RUnlock()
if shouldIgnoreChange {
p.numIgnoredChanges++
}
p.prefLock.Unlock()
if shouldIgnoreChange { // callback after loading, no need to save
return
}
Expand Down
6 changes: 3 additions & 3 deletions internal/preferences.go
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ func (p *InMemoryPreferences) WriteValues(fn func(map[string]interface{})) {
fn(p.values)
p.lock.Unlock()

p.fireChange()
p.FireChange()
}

func (p *InMemoryPreferences) set(key string, value interface{}) {
Expand All @@ -50,7 +50,7 @@ func (p *InMemoryPreferences) set(key string, value interface{}) {
p.values[key] = value
p.lock.Unlock()

p.fireChange()
p.FireChange()
}

func (p *InMemoryPreferences) get(key string) (interface{}, bool) {
Expand All @@ -68,7 +68,7 @@ func (p *InMemoryPreferences) remove(key string) {
delete(p.values, key)
}

func (p *InMemoryPreferences) fireChange() {
func (p *InMemoryPreferences) FireChange() {
p.lock.RLock()
defer p.lock.RUnlock()

Expand Down