3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00

Merge pull request #839 from slingamn/issue838

fix #838
This commit is contained in:
Shivaram Lingamneni 2020-03-01 20:19:50 -08:00 committed by GitHub
commit bcaaeca63b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -367,7 +367,7 @@ func displaySetting(settingName string, settings AccountSettings, client *Client
} }
case "always-on": case "always-on":
stored := settings.AlwaysOn stored := settings.AlwaysOn
actual := client.AlwaysOn() actual := persistenceEnabled(config.Accounts.Multiclient.AlwaysOn, stored)
nsNotice(rb, fmt.Sprintf(client.t("Your stored always-on setting is: %s"), persistentStatusToString(stored))) nsNotice(rb, fmt.Sprintf(client.t("Your stored always-on setting is: %s"), persistentStatusToString(stored)))
if actual { if actual {
nsNotice(rb, client.t("Given current server settings, your client is always-on")) nsNotice(rb, client.t("Given current server settings, your client is always-on"))
@ -377,7 +377,8 @@ func displaySetting(settingName string, settings AccountSettings, client *Client
case "autoreplay-missed": case "autoreplay-missed":
stored := settings.AutoreplayMissed stored := settings.AutoreplayMissed
if stored { if stored {
if client.AlwaysOn() { alwaysOn := persistenceEnabled(config.Accounts.Multiclient.AlwaysOn, settings.AlwaysOn)
if alwaysOn {
nsNotice(rb, client.t("Autoreplay of missed messages is enabled")) nsNotice(rb, client.t("Autoreplay of missed messages is enabled"))
} else { } else {
nsNotice(rb, client.t("You have enabled autoreplay of missed messages, but you can't receive them because your client isn't set to always-on")) nsNotice(rb, client.t("You have enabled autoreplay of missed messages, but you can't receive them because your client isn't set to always-on"))