[Scummvm-cvs-logs] scummvm master -> 0f55fc9246b50120a8e2c5cd256231843643d700

sev- sev at scummvm.org
Sun Apr 3 23:11:13 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:
0925e9cd29 UPDATES: Fix endless loop
0f55fc9246 UPDATES: Use www.scummvm.org to avoid redirects


Commit: 0925e9cd2966111ffde6f9de47d95869c4a74dc3
    https://github.com/scummvm/scummvm/commit/0925e9cd2966111ffde6f9de47d95869c4a74dc3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-03T23:10:55+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: 0f55fc9246b50120a8e2c5cd256231843643d700
    https://github.com/scummvm/scummvm/commit/0f55fc9246b50120a8e2c5cd256231843643d700
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-03T23:10:55+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 baa309c..152c748 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