From f1b6df400f192e2401af90dbcaefc5ad3bf019cf Mon Sep 17 00:00:00 2001 From: jenli669 Date: Mon, 24 Jun 2019 02:04:02 +0200 Subject: [PATCH] refactor(startup): return early in makeToxPortable logic --- src/persistence/settings.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index 44344137e..e86687999 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -268,17 +268,15 @@ void Settings::loadGlobal() bool Settings::isToxPortable() { QString localSettingsPath = qApp->applicationDirPath() + QDir::separator() + globalSettingsFile; - bool result; - - if (QFile(localSettingsPath).exists()) { - QSettings ps(localSettingsPath, QSettings::IniFormat); - ps.setIniCodec("UTF-8"); - ps.beginGroup("Advanced"); - result = ps.value("makeToxPortable", false).toBool(); - ps.endGroup(); - return result; + if (!QFile(localSettingsPath).exists()) { + return false; } - return false; + QSettings ps(localSettingsPath, QSettings::IniFormat); + ps.setIniCodec("UTF-8"); + ps.beginGroup("Advanced"); + bool result = ps.value("makeToxPortable", false).toBool(); + ps.endGroup(); + return result; } void Settings::updateProfileData(Profile *profile)