[Scummvm-cvs-logs] scummvm branch-1-8 -> 50c49a040cd80626dafdd5bdb0e89f8d9328ca05
sev-
sev at scummvm.org
Sun Apr 3 23:11:16 CEST 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0a0b0bfa7d UPDATES: Fix endless loop
50c49a040c UPDATES: Use www.scummvm.org to avoid redirects
Commit: 0a0b0bfa7df23e03d6245b160d83e05bd294036c
https://github.com/scummvm/scummvm/commit/0a0b0bfa7df23e03d6245b160d83e05bd294036c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-03T23:10:39+02:00
Commit Message:
UPDATES: Fix endless loop
Changed paths:
common/updates.cpp
diff --git a/common/updates.cpp b/common/updates.cpp
index 552324e..4174a96 100644
--- a/common/updates.cpp
+++ b/common/updates.cpp
@@ -41,9 +41,11 @@ const int *UpdateManager::getUpdateIntervals() {
int UpdateManager::normalizeInterval(int interval) {
const int *val = updateIntervals;
- while (*val != -1)
+ while (*val != -1) {
if (*val > interval)
return *val;
+ val++;
+ }
return val[-1]; // Return maximal acceptable value
}
Commit: 50c49a040cd80626dafdd5bdb0e89f8d9328ca05
https://github.com/scummvm/scummvm/commit/50c49a040cd80626dafdd5bdb0e89f8d9328ca05
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-03T23:10:39+02:00
Commit Message:
UPDATES: Use www.scummvm.org to avoid redirects
Changed paths:
dists/macosx/Info.plist
dists/macosx/Info.plist.in
dists/macosx/scummvm_appcast.xml
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 3b45e5d..9d067e5 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -53,7 +53,7 @@
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
- <string>https://scummvm.org/scummvm_appcast.xml</string>
+ <string>https://www.scummvm.org/scummvm_appcast.xml</string>
<key>NSDockTilePlugIn</key>
<string>scummvm.docktileplugin</string>
<key>SUPublicDSAKeyFile</key>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index 6393900..a430ff7 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -53,7 +53,7 @@
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
- <string>https://scummvm.org/scummvm_appcast.xml</string>
+ <string>https://www.scummvm.org/scummvm_appcast.xml</string>
<key>NSDockTilePlugIn</key>
<string>scummvm.docktileplugin</string>
<key>SUPublicDSAKeyFile</key>
diff --git a/dists/macosx/scummvm_appcast.xml b/dists/macosx/scummvm_appcast.xml
index cf4cbcd..a4a15a2 100644
--- a/dists/macosx/scummvm_appcast.xml
+++ b/dists/macosx/scummvm_appcast.xml
@@ -2,7 +2,7 @@
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title>ScummVM Changelog</title>
- <link>https://scummvm.org/scummvm_appcast.xml</link>
+ <link>https://www.scummvm.org/scummvm_appcast.xml</link>
<description>Most recent changes with links to updates.</description>
<language>en</language>
<item>
@@ -11,18 +11,18 @@
https://scummvm.org/frs/scummvm/1.8.0/ReleaseNotes
</sparkle:releaseNotesLink>
<pubDate>Sat, 5 Mar 2016 20:16:00 +0000</pubDate>
- <enclosure url="https://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-macosx.dmg"
+ <enclosure url="https://www.scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-macosx.dmg"
sparkle:version="1.8.0" length="14085288" type="application/octet-stream"
sparkle:dsaSignature="MC0CFQDNy2yox7vklthHaZcMto8L4EuLwQIUY8cuevlTpLtuJ9nPOlrj4vo55lY=" />
<enclosure sparkle:os="windows"
- url="https://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-win32.exe"
+ url="https://www.scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-win32.exe"
sparkle:version="1.8.0" length="9081062" type="application/octet-stream"
sparkle:dsaSignature="MC0CFQCaG7Oo+Nc2EWVmc7GjUBJLKRvt3QIUQcZTMe2FQhfvrrofX4HLTldDHyY=" />
</item>
<item>
<title>Version 1.7.0</title>
<sparkle:releaseNotesLink>
- https://scummvm.org/frs/scummvm/1.7.0/ReleaseNotes
+ https://www.scummvm.org/frs/scummvm/1.7.0/ReleaseNotes
</sparkle:releaseNotesLink>
<pubDate>Tue, 29 Jul 2014 07:58:00 +0000</pubDate>
<link>https://www.scummvm.org/frs/scummvm/1.7.0/</link>
More information about the Scummvm-git-logs
mailing list