settings: Make Un-/MarshalJSON thread safe

limetext · Sep 26, 2015 · 0af0865 · 0af0865
1 parent d3174ab
commit 0af0865
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/settings.go b/settings.go
@@ -51,10 +51,14 @@ func (s *Settings) Parent() SettingsInterface {
 }
 
 func (s *Settings) UnmarshalJSON(data []byte) error {
+	s.lock.Lock()
+	defer s.lock.Unlock()
 	return json.Unmarshal(data, &s.data)
 }
 
 func (s *Settings) MarshalJSON() (data []byte, err error) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
 	return json.Marshal(&s.data)
 }