merged branch 1.25 fixes

src/common/autoconfig-win.h

@@ -112,10 +112,10 @@ overriden in the c++ code by ifdefs _WIN32 anyway  */
 #define PACKAGE_NAME "Recoll"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Recoll 1.25.19"
+#define PACKAGE_STRING "Recoll 1.25.21"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.25.19"
+#define PACKAGE_VERSION "1.25.21"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "recoll"

src/common/rclconfig.cpp

@@ -1559,6 +1559,9 @@ vector<string> RclConfig::getSkippedPaths() const
     // don't do this.
     skpl.push_back(getDbDir());
     skpl.push_back(getConfDir());
+#ifdef _WIN32
+	skpl.push_back(TempFile::rcltmpdir());
+#endif
     if (getCacheDir().compare(getConfDir())) {
         skpl.push_back(getCacheDir());
     }