From 7c3c92f8b8d0c67d817095d367720272d96882ab Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 12 Nov 2022 17:24:31 +0000 Subject: [PATCH] Fix #10155: SyncCompanySettings sending old instead of new setting values (#10158) --- src/settings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings.cpp b/src/settings.cpp index 975c82f850..edf4e2441d 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1602,8 +1602,8 @@ void SyncCompanySettings() const void *new_object = &_settings_client.company; for (auto &desc : _company_settings) { const SettingDesc *sd = GetSettingDesc(desc); - uint32 old_value = (uint32)sd->AsIntSetting()->Read(new_object); - uint32 new_value = (uint32)sd->AsIntSetting()->Read(old_object); + uint32 old_value = (uint32)sd->AsIntSetting()->Read(old_object); + uint32 new_value = (uint32)sd->AsIntSetting()->Read(new_object); if (old_value != new_value) Command::SendNet(STR_NULL, _local_company, sd->GetName(), new_value); } }