From de3a998e7e9037ed081c08311276f40d185ba49c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 4 Aug 2005 18:23:51 +0000 Subject: [PATCH] BUG: [ 1247700 ] Cannot browse to parent folders of selected folders - Fix from Jochen --- Src/DirDoc.cpp | 7 +++++-- Src/readme.txt | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp index 8fae541d4..d0a808ce2 100644 --- a/Src/DirDoc.cpp +++ b/Src/DirDoc.cpp @@ -221,8 +221,11 @@ CDirDoc::AllowUpwardDirectory::ReturnCode CDirDoc::AllowUpwardDirectory() { return ( - GetLeftBasePath().GetLength() > m_cchLeftRoot - ? AllowUpwardDirectory::ParentIsRegularPath + GetLeftBasePath().GetLength() > m_cchLeftRoot + || m_pTempPathContext == NULL + && lstrcmpi(PathFindFileName(GetLeftBasePath()), + PathFindFileName(GetRightBasePath())) == 0 + ? AllowUpwardDirectory::ParentIsRegularPath : m_pTempPathContext && m_pTempPathContext->m_pParent ? AllowUpwardDirectory::ParentIsTempPath : AllowUpwardDirectory::No diff --git a/Src/readme.txt b/Src/readme.txt index 44a47553b..33c6ad322 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,8 @@ +2005-08-04 Kimmo + BUG: [ 1247700 ] Cannot browse to parent folders of selected folders + Fix from Jochen + Src: DirDoc.cpp + 2005-07-31 Perry PATCH: [ 1248180 ] fix moved block code BUG: [ 1248172 ] Assert failure in CDiffWrapper::RunFileDiff -- 2.11.0