From e242afedd67bb826f1b40ae40c50ca947c8b4e57 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 24 May 2017 14:46:19 +0200 Subject: [PATCH] On Windows, previously opened raw files can't be moved or deleted until RawTherapee is closed. Fixes #3884 --- rtengine/rawimage.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc index d8dc7eb1d..7b6ee8782 100644 --- a/rtengine/rawimage.cc +++ b/rtengine/rawimage.cc @@ -39,6 +39,7 @@ RawImage::~RawImage() { if(ifp) { fclose(ifp); + ifp = nullptr; } if( image ) { @@ -410,7 +411,11 @@ int RawImage::loadRaw (bool loadData, unsigned int imageNum, bool closeFile, Pro verbose = settings->verbose; oprof = nullptr; - ifp = gfopen (ifname); // Maps to either file map or direct fopen + if(!ifp) { + ifp = gfopen (ifname); // Maps to either file map or direct fopen + } else { + fseek (ifp, 0, SEEK_SET); + } if (!ifp) { return 3;