Permalink
Browse files

Auto update now listens to the configured auto_update settings (#1654…

…, thanks, meskibob!)
  • Loading branch information...
1 parent bb679b5 commit 64ec19bfa114daf5de441b8e4dfe23bb52925efb @Raptor399 Raptor399 committed Jan 22, 2014
Showing with 10 additions and 2 deletions.
  1. +1 −0 CHANGELOG.txt
  2. +2 −1 src/main/java/net/pms/PMS.java
  3. +7 −1 src/main/java/net/pms/configuration/PmsConfiguration.java
View
1 CHANGELOG.txt
@@ -14,6 +14,7 @@ Changelog:
- Updated FFmpeg for Windows to latest Zeranoe FFmpeg build
- Improved matching algorithm to avoid unneccesary transcoding (thanks, Liboicl!)
- Fixed UTF-8 .m3u8 playlist playback (#1317, thanks, mindwarper!)
+ - Auto update now listens to the configured auto_update setting (#1654)
1.90.1 - 2013-08-17
View
3 src/main/java/net/pms/PMS.java
@@ -415,7 +415,8 @@ private boolean init() throws Exception {
displayBanner();
AutoUpdater autoUpdater = null;
- if (Build.isUpdatable()) {
+
+ if (configuration.isAutoUpdate()) {
String serverURL = Build.getUpdateServerURL();
autoUpdater = new AutoUpdater(serverURL, getVersion());
}
View
8 src/main/java/net/pms/configuration/PmsConfiguration.java
@@ -2253,8 +2253,14 @@ public String getProfileName() {
return profileName;
}
+ /**
+ * Returns whether or not to automatically download software updates.
+ * Defaults to "true" when updating is possible, unless configured otherwise.
+ *
+ * @return Whether or not to auto update.
+ */
public boolean isAutoUpdate() {
- return Build.isUpdatable() && getBoolean(KEY_AUTO_UPDATE, false);
+ return Build.isUpdatable() && getBoolean(KEY_AUTO_UPDATE, true);
}
public void setAutoUpdate(boolean value) {

0 comments on commit 64ec19b

Please sign in to comment.