summaryrefslogtreecommitdiffstats
path: root/app/license.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2018-02-16 13:51:46 -0600
committerJoram Wilander <jwawilander@gmail.com>2018-02-16 14:51:46 -0500
commit30197584d5a215a3b25bffa79a034ed9e360cf52 (patch)
treeb3985b0791ee9e3b16c50b6399339a2c5c811b82 /app/license.go
parent8c3a7b75de5be45a64dc06c4e998817e7b52d6bc (diff)
downloadchat-30197584d5a215a3b25bffa79a034ed9e360cf52.tar.gz
chat-30197584d5a215a3b25bffa79a034ed9e360cf52.tar.bz2
chat-30197584d5a215a3b25bffa79a034ed9e360cf52.zip
always return non-nil client license (#8317)
Diffstat (limited to 'app/license.go')
-rw-r--r--app/license.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/license.go b/app/license.go
index efb725a20..c12f23d1d 100644
--- a/app/license.go
+++ b/app/license.go
@@ -130,7 +130,7 @@ func (a *App) SetLicense(license *model.License) bool {
}
a.licenseValue.Store((*model.License)(nil))
- a.SetClientLicense(map[string]string{"IsLicensed": "false"})
+ a.clientLicenseValue.Store(map[string]string(nil))
return false
}
@@ -149,8 +149,10 @@ func (a *App) SetClientLicense(m map[string]string) {
}
func (a *App) ClientLicense() map[string]string {
- clientLicense, _ := a.clientLicenseValue.Load().(map[string]string)
- return clientLicense
+ if clientLicense, _ := a.clientLicenseValue.Load().(map[string]string); clientLicense != nil {
+ return clientLicense
+ }
+ return map[string]string{"IsLicensed": "false"}
}
func (a *App) RemoveLicense() *model.AppError {