mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Fix a memory leak using a recursive lambda.

Browse Source
This commit is contained in:
John Preston
2020-07-06 15:51:58 +04:00
parent 900f7e1304
commit 52e780b065
5 changed files with 70 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Telegram/SourceFiles/settings/settings_main.cpp
View File

@@ -209,10 +209,11 @@ void SetupInterfaceScale(
}
return (result == ScaleValues.size()) ? (result - 1) : result;
};
const auto inSetScale = Ui::CreateChild<bool>(container.get());
const auto setScale = std::make_shared<Fn<void(int)>>();
*setScale = [=](int scale) {
if (*inSetScale) return;
const auto inSetScale = container->lifetime().make_state<bool>();
const auto setScale = [=](int scale, const auto &repeatSetScale) -> void {
if (*inSetScale) {
return;
}
*inSetScale = true;
const auto guard = gsl::finally([=] { *inSetScale = false; });
@@ -228,7 +229,7 @@ void SetupInterfaceScale(
base::call_delayed(
st::defaultSettingsSlider.duration,
button,
[=] { (*setScale)(cConfigScale()); });
[=] { repeatSetScale(cConfigScale(), repeatSetScale); });
});
Ui::show(Box<ConfirmBox>(
tr::lng_settings_need_restart(tr::now),
@@ -256,16 +257,16 @@ void SetupInterfaceScale(
) | rpl::map([=](int section) {
return scaleByIndex(section);
}) | rpl::start_with_next([=](int scale) {
(*setScale)((scale == cScreenScale())
? style::kScaleAuto
: scale);
setScale(
(scale == cScreenScale()) ? style::kScaleAuto : scale,
setScale);
}, slider->lifetime());
button->toggledValue(
) | rpl::map([](bool checked) {
return checked ? style::kScaleAuto : cEvalScale(cConfigScale());
}) | rpl::start_with_next([=](int scale) {
(*setScale)(scale);
setScale(scale, setScale);
}, button->lifetime());
}