From ff0bed96a4a793aa418f664cf8e4d684c086f6d6 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 12 Nov 2022 13:44:11 +0000 Subject: [PATCH] Fix SyncCompanySettings not sending correct setting values --- src/settings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings.cpp b/src/settings.cpp index d5342099c4..26d74af446 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -2638,8 +2638,8 @@ void SyncCompanySettings() for (auto &sd : _company_settings) { if (!sd->IsIntSetting()) continue; if (!SlIsObjectCurrentlyValid(sd->save.version_from, sd->save.version_to, sd->save.ext_feature_test)) continue; - 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) NetworkSendCommand(0, 0, new_value, 0, CMD_CHANGE_COMPANY_SETTING, nullptr, sd->name, _local_company, 0); } }