Merge branch 'peerRace' of dan/ui into master

This commit is contained in:
Sarah Jamie Lewis 2019-11-06 12:37:12 -08:00 committed by Gogs
commit 4f205f7c4f
1 changed files with 3 additions and 1 deletions

View File

@ -506,7 +506,9 @@ func (this *GrandCentralDispatcher) setLocale(locale string) {
func (this *GrandCentralDispatcher) onActivate() {
log.Debugln("onActivate")
the.CwtchApp.QueryACNStatus()
if the.CwtchApp != nil {
the.CwtchApp.QueryACNStatus()
}
}
func (this *GrandCentralDispatcher) SetLocale_helper(locale string) {