From 6235f1a50d0c3ad02d32862a87e1341ca2fe8091 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Wed, 5 Oct 2005 16:30:39 +0000 Subject: [PATCH] 2005-10-05 Perry PATCH: [ 1242008 ] Update status to binary if open fails because binary Follow on for 2nd case Src: DirView.cpp MergeDoc.cpp --- Src/Changes.txt | 5 +++++ Src/DirView.cpp | 3 +-- Src/MergeDoc.cpp | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index 308f7d5e3..117758118 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -1,3 +1,8 @@ +2005-10-05 Perry + PATCH: [ 1242008 ] Update status to binary if open fails because binary + Follow on for 2nd case + Src: DirView.cpp MergeDoc.cpp + 2005-10-03 Perry PATCH: [ 1302710 ] generating a report is slow Perry added comments explaining one code line diff --git a/Src/DirView.cpp b/Src/DirView.cpp index eaedcd1b5..58415b39d 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -880,7 +880,6 @@ bool CDirView::GetSelectedItems(int * sel1, int * sel2) */ void CDirView::OpenSelection(PackingInfo * infoUnpacker /*= NULL*/) { - int sel = -1; CDirDoc * pDoc = GetDocument(); @@ -1044,7 +1043,7 @@ void CDirView::OpenSelection(PackingInfo * infoUnpacker /*= NULL*/) if (di1 == di2) { di1->setBin(); - GetDocument()->ReloadItemStatus(sel, FALSE, FALSE); + GetDocument()->ReloadItemStatus(sel1, FALSE, FALSE); } } } diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 5dab31dda..03e0fb0c8 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -2637,6 +2637,7 @@ CMergeDoc::OpenDocs(CString sLeftFile, CString sRightFile, if (nLeftSuccess == FRESULT_BINARY || nRightSuccess == FRESULT_BINARY) { CompareBinaries(sLeftFile, sRightFile, nLeftSuccess, nRightSuccess); + return OPENRESULTS_FAILED_BINARY; } return OPENRESULTS_FAILED_MISC; } -- 2.11.0