OSDN Git Service

Disable Auto-Update, by default, when running in "portable" mode.
authorLoRd_MuldeR <mulder2@gmx.de>
Sun, 2 Feb 2014 17:01:26 +0000 (18:01 +0100)
committerLoRd_MuldeR <mulder2@gmx.de>
Sun, 2 Feb 2014 17:01:26 +0000 (18:01 +0100)
src/Config.h
src/Global_Version.cpp
src/Model_Settings.cpp

index 8c8485a..76a5ccc 100644 (file)
@@ -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
 
 ///////////////////////////////////////////////////////////////////////////////
index 7157afe..8f16b2b 100644 (file)
@@ -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;
        }
index 0c5ecea..b7301ba 100644 (file)
@@ -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)