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

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 308f7d5..1177581 100644 (file)
--- 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 eaedcd1..58415b3 100644 (file)
--- 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 5dab31d..03e0fb0 100644 (file)
--- 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;
        }