# HG changeset patch
# User Chris Cannam
# Date 1195135436 0
# Node ID a6fab10ff9e6bcf304fed57e29f188f4368b52d8
# Parent  02d2ad95ea5204ccad22f135c51fa8d943d14684
* Merge last fix from trunk

diff -r 02d2ad95ea52 -r a6fab10ff9e6 data/fileio/FileSource.cpp
--- a/data/fileio/FileSource.cpp	Tue Nov 13 13:54:10 2007 +0000
+++ b/data/fileio/FileSource.cpp	Thu Nov 15 14:03:56 2007 +0000
@@ -77,6 +77,7 @@
         waitForStatus();
 
         if (!isAvailable()) {
+
             // The URL was created on the assumption that the string
             // was human-readable.  Let's try again, this time
             // assuming it was already encoded.
@@ -85,7 +86,19 @@
                       << "\" as human-readable URL; "
                       << "trying again treating it as encoded URL"
                       << std::endl;
+
+            // even though our cache file doesn't exist (because the
+            // resource was 404), we still need to ensure we're no
+            // longer associating a filename with this url in the
+            // refcount map -- or createCacheFile will think we've
+            // already done all the work and no request will be sent
+            deleteCacheFile();
+
             m_url.setEncodedUrl(fileOrUrl.toAscii());
+
+            m_ok = false;
+            m_done = false;
+            m_lastStatus = 0;
             init(showProgress);
         }
     }