From 272214778aee9ae0d43ef814615c2f9327949755 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sun, 2 Feb 2014 18:01:26 +0100 Subject: [PATCH] Disable Auto-Update, by default, when running in "portable" mode. --- src/Config.h | 2 +- src/Global_Version.cpp | 2 +- src/Model_Settings.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Config.h b/src/Config.h index 8c8485a2..76a5ccc9 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 9 #define VER_LAMEXP_TYPE Final #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 1524 +#define VER_LAMEXP_BUILD 1525 #define VER_LAMEXP_CONFG 1524 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Global_Version.cpp b/src/Global_Version.cpp index 7157afea..8f16b2b4 100644 --- a/src/Global_Version.cpp +++ b/src/Global_Version.cpp @@ -311,7 +311,7 @@ bool lamexp_portable_mode(void) QString baseName = QFileInfo(QApplication::applicationFilePath()).completeBaseName(); int idx1 = baseName.indexOf("lamexp", 0, Qt::CaseInsensitive); int idx2 = baseName.lastIndexOf("portable", -1, Qt::CaseInsensitive); - g_lamexp_portable.bPortableModeEnabled = (idx1 >= 0) && (idx2 >= 0) && (idx1 < idx2); + g_lamexp_portable.bPortableModeEnabled = ((idx1 >= 0) && (idx2 >= 0) && (idx1 < idx2)); } g_lamexp_portable.bInitialized = true; } diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp index 0c5ecea6..b7301baa 100644 --- a/src/Model_Settings.cpp +++ b/src/Model_Settings.cpp @@ -561,7 +561,7 @@ LAMEXP_MAKE_OPTION_I(aftenExponentSearchSize, 8) LAMEXP_MAKE_OPTION_B(aftenFastBitAllocation, false) LAMEXP_MAKE_OPTION_B(antivirNotificationsEnabled, true) LAMEXP_MAKE_OPTION_B(autoUpdateCheckBeta, false) -LAMEXP_MAKE_OPTION_B(autoUpdateEnabled, true) +LAMEXP_MAKE_OPTION_B(autoUpdateEnabled, (!lamexp_portable_mode())); LAMEXP_MAKE_OPTION_S(autoUpdateLastCheck, "Never") LAMEXP_MAKE_OPTION_B(bitrateManagementEnabled, false) LAMEXP_MAKE_OPTION_I(bitrateManagementMaxRate, 500)