From 83b2b9538184d3299cbd13015e24304beed15a8e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 5 Nov 2020 00:09:23 +0100 Subject: [PATCH] [libcalamares] Reduce object churn - we don't need to allocate a new translator each time the language changes --- src/libcalamares/utils/Retranslator.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp index 41d5966ab..46bafab85 100644 --- a/src/libcalamares/utils/Retranslator.cpp +++ b/src/libcalamares/utils/Retranslator.cpp @@ -168,17 +168,17 @@ TZLoader::tryLoad( QTranslator* translator ) static void loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p ) { - QTranslator* translator = new QTranslator(); - loader.tryLoad( translator ); - - if ( translator_p ) + if ( !translator_p ) { - QCoreApplication::removeTranslator( translator_p ); - delete translator_p; + QTranslator* translator = new QTranslator(); + loader.tryLoad( translator ); + QCoreApplication::installTranslator( translator ); + translator_p = translator; + } + else + { + loader.tryLoad( translator_p ); } - - QCoreApplication::installTranslator( translator ); - translator_p = translator; } namespace CalamaresUtils