From d1e46cdd499c685c694ca3bd6e094cbf903741cf Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 25 May 2016 21:46:16 +0100
Subject: [PATCH] Allow updating a Catalog URL explicitly.

Needed for fallback Catalog URL support.
---
 simgear/package/Catalog.cxx | 12 ++++++++++--
 simgear/package/Catalog.hxx |  6 ++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/simgear/package/Catalog.cxx b/simgear/package/Catalog.cxx
index 2ce17d5e..8e912ff9 100644
--- a/simgear/package/Catalog.cxx
+++ b/simgear/package/Catalog.cxx
@@ -144,7 +144,7 @@ protected:
                        " to \n\t" << url);
 
                 // update the URL and kick off a new request
-                m_owner->m_url = url;
+                m_owner->setUrl(url);
                 Downloader* dl = new Downloader(m_owner, url);
                 m_owner->root()->makeHTTPRequest(dl);
             } else {
@@ -437,6 +437,14 @@ std::string Catalog::url() const
     return m_url;
 }
 
+void Catalog::setUrl(const std::string &url)
+{
+    m_url = url;
+    if (m_status == Delegate::FAIL_NOT_FOUND) {
+        m_status = Delegate::FAIL_UNKNOWN;
+    }
+}
+
 std::string Catalog::name() const
 {
     return getLocalisedString(m_props, "name");
@@ -505,8 +513,8 @@ std::string Catalog::getLocalisedString(const SGPropertyNode* aRoot, const char*
 
 void Catalog::refreshComplete(Delegate::StatusCode aReason)
 {
-    changeStatus(aReason);
     m_refreshRequest.reset();
+    changeStatus(aReason);
 }
 
 void Catalog::changeStatus(Delegate::StatusCode newStatus)
diff --git a/simgear/package/Catalog.hxx b/simgear/package/Catalog.hxx
index 11928b1c..8c6e2efc 100644
--- a/simgear/package/Catalog.hxx
+++ b/simgear/package/Catalog.hxx
@@ -106,6 +106,12 @@ public:
 
     std::string url() const;
 
+    /**
+     * update the URL of a package. Does not trigger a refresh, but resets
+     * error state if the previous URL was not found.
+     */
+    void setUrl(const std::string& url);
+
     std::string name() const;
 
     std::string description() const;
-- 
2.39.5