From 391920624d4e3f5536bc5a6977207115ab8c4a96 Mon Sep 17 00:00:00 2001
From: mchinen <mchinen@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Tue, 17 May 2011 21:15:17 +0000
Subject: [PATCH] Bug 137 (P2) - fix regression caused by r11118 where orphan
 files weren't detected

---
 src/DirManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DirManager.cpp b/src/DirManager.cpp
index 6fdc41213..d0ada1fb5 100644
--- a/src/DirManager.cpp
+++ b/src/DirManager.cpp
@@ -912,7 +912,7 @@ BlockFile *DirManager::NewODDecodeBlockFile(
 
 bool DirManager::ContainsBlockFile(BlockFile *b)
 {
-   return b ? mBlockFileHash[b->GetFileName().GetName()] == b : NULL;
+   return b ? mBlockFileHash[b->GetFileName().GetName()] == b : false;
 }
 
 bool DirManager::ContainsBlockFile(wxString filepath)
@@ -1726,7 +1726,7 @@ void DirManager::FindOrphanBlockFiles(
          }
          
          // Ignore it if it exists in the clipboard (from a previously closed project)
-         if (clipboardDM && clipboardDM->ContainsBlockFile(fullname.GetFullPath()))
+         if (!(clipboardDM && clipboardDM->ContainsBlockFile(basename)))
             orphanFilePathArray.Add(fullname.GetFullPath());
       }
    }