diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-06-20 21:41:18 +0200 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-06-22 00:26:02 +0300 |
| commit | c65617661a626c58c2fa14a438d6b6d4af5ce0a8 (patch) | |
| tree | af102803b3d8de638dbbe626d393f540555cbccc /dives/SampleDivesV2.ssrf | |
| parent | 74d1afc0d5cd2baa6a787864d41d742f7864029d (diff) | |
| download | subsurface-c65617661a626c58c2fa14a438d6b6d4af5ce0a8.tar.gz | |
Dive pictures: fix loading of remote images without local version
Owing to the recent churn in imagedownloader.cpp, some of the
code was bogus.
Notably, in f60343eebbf6a31a4643dde9f4454f6ce84f61d3 the code
was changed such that always the local filename was used to access
the images. Yet, the old code remained, which after failure tried
again to access the local picture. This second access can obviously
be removed completely.
More seriously, after failing to load the local version, no
attempt was made to fetch the image via canonical filename. This
could produce the following sequence of events:
- Import remote image
- Delete thumbnail and local cache of image
- Image loading would fail
Therefore, first try to load using local file-location. If
that fails, load using the canonical file-location. To do
so, split the file-access code in two functions. The code
should now be distinctly easier to follow.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'dives/SampleDivesV2.ssrf')
0 files changed, 0 insertions, 0 deletions