From 2817f54c96ea98925551d4733ce3f25fa4a6c438 Mon Sep 17 00:00:00 2001
From: ctrlaltca <ctrlaltca@gmail.com>
Date: Mon, 13 Mar 2017 23:21:15 +0100
Subject: [PATCH] Fix issues with new updater; fix #2465 (#2468)

* fix #2465
---
 cockatrice/src/dlg_update.cpp     | 3 ++-
 cockatrice/src/releasechannel.cpp | 9 +++++++--
 cockatrice/src/settingscache.cpp  | 5 +++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cockatrice/src/dlg_update.cpp b/cockatrice/src/dlg_update.cpp
index 8c67e83d..d5debf3c 100644
--- a/cockatrice/src/dlg_update.cpp
+++ b/cockatrice/src/dlg_update.cpp
@@ -108,12 +108,13 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas
         //If there's no need to update, tell them that. However we still allow them to run the
         //downloader themselves if there's a compatible build
         QMessageBox::information(this, tr("Cockatrice Update"), tr("Your version of Cockatrice is up to date."));
+        return;
     }
 
+    publishDate = release->getPublishDate().toString(Qt::DefaultLocaleLongDate);
     if (isCompatible) {
         //If there is an update, save its URL and work out its name
         updateUrl = release->getDownloadUrl();
-        publishDate = release->getPublishDate().toString(Qt::DefaultLocaleLongDate);
 
         QMessageBox::StandardButton reply;
         reply = QMessageBox::question(this, "Update Available",
diff --git a/cockatrice/src/releasechannel.cpp b/cockatrice/src/releasechannel.cpp
index d3b6ddda..1e48bacc 100644
--- a/cockatrice/src/releasechannel.cpp
+++ b/cockatrice/src/releasechannel.cpp
@@ -16,6 +16,7 @@
 #define DEVFILES_URL "https://api.bintray.com/packages/cockatrice/Cockatrice/Cockatrice-git/files"
 #define DEVDOWNLOAD_URL "https://dl.bintray.com/cockatrice/Cockatrice/"
 #define DEVMANUALDOWNLOAD_URL "https://bintray.com/cockatrice/Cockatrice/Cockatrice-git/_latestVersion#files"
+#define DEVRELEASE_DESCURL "https://github.com/Cockatrice/Cockatrice/compare/%1...%2"
 #define GIT_SHORT_HASH_LEN 7
 
 int ReleaseChannel::sharedIndex = 0;
@@ -253,11 +254,15 @@ void DevReleaseChannel::releaseListFinished()
     if(!lastRelease)
         lastRelease = new Release;
 
-    lastRelease->setName("Commit " + resultMap["sha"].toString());
-    lastRelease->setDescriptionUrl(resultMap["html_url"].toString());
+    
     lastRelease->setCommitHash(resultMap["sha"].toString());
     lastRelease->setPublishDate(resultMap["commit"].toMap()["author"].toMap()["date"].toDate());
 
+    QString shortHash = lastRelease->getCommitHash().left(GIT_SHORT_HASH_LEN);
+    lastRelease->setName("Commit " + shortHash);
+
+    lastRelease->setDescriptionUrl(QString(DEVRELEASE_DESCURL).arg(VERSION_COMMIT, shortHash));
+    
     qDebug() << "Got reply from release server, size=" << tmp.size()
         << "name=" << lastRelease->getName()
         << "desc=" << lastRelease->getDescriptionUrl()
diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp
index 397939bb..ea6320cd 100644
--- a/cockatrice/src/settingscache.cpp
+++ b/cockatrice/src/settingscache.cpp
@@ -166,8 +166,9 @@ SettingsCache::SettingsCache()
         translateLegacySettings();
 
     // updates - don't reorder them or their index in the settings won't match
-    releaseChannels << new StableReleaseChannel()
-        << new DevReleaseChannel();
+    // append channels one by one, or msvc will add them in the wrong order.
+    releaseChannels << new StableReleaseChannel();
+    releaseChannels << new DevReleaseChannel();
 
     notifyAboutUpdates = settings->value("personal/updatenotification", true).toBool();
     updateReleaseChannel = settings->value("personal/updatereleasechannel", 0).toInt();