From b64974c10b414284aebbb6b70a66a87b0f74c57b Mon Sep 17 00:00:00 2001 From: Christian Schenk Date: Fri, 27 Jul 2018 17:01:25 +0200 Subject: [PATCH] Path pattern starts with //: no recursive search (fixes #50) --- Libraries/MiKTeX/Core/Session/searchpath.cpp | 2 +- Libraries/MiKTeX/Core/version.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/MiKTeX/Core/Session/searchpath.cpp b/Libraries/MiKTeX/Core/Session/searchpath.cpp index ca0d51993..91de90688 100644 --- a/Libraries/MiKTeX/Core/Session/searchpath.cpp +++ b/Libraries/MiKTeX/Core/Session/searchpath.cpp @@ -245,7 +245,7 @@ void SessionImpl::ExpandPathPattern(const PathName& rootDirectory, const PathNam { MIKTEX_ASSERT(!pathPattern.Empty()); const char* lpszRecursionIndicator = strstr(pathPattern.GetData(), RECURSION_INDICATOR); - if (lpszRecursionIndicator == nullptr) + if (lpszRecursionIndicator == nullptr || rootDirectory.Empty() && lpszRecursionIndicator == pathPattern.GetData()) { // no recursion; check to see whether the path pattern specifies an // existing sub directory diff --git a/Libraries/MiKTeX/Core/version.cmake b/Libraries/MiKTeX/Core/version.cmake index a7c63a1ec..f361e849c 100644 --- a/Libraries/MiKTeX/Core/version.cmake +++ b/Libraries/MiKTeX/Core/version.cmake @@ -17,5 +17,5 @@ ## Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -set(MIKTEX_COMP_J2000_VERSION 6778) +set(MIKTEX_COMP_J2000_VERSION 6782) set(MIKTEX_COMP_INTERFACE_VERSION 7)