#
#
# patch "src/model/Inventory.cpp"
#  from [34a728d73f166c666e54d902b676f74903f8e2a7]
#    to [db9f63fec8fdfb7ba5627df47cc5486b37c6e131]
# 
# patch "src/view/dialogs/UnaccountedRenames.cpp"
#  from [fd374b3f0fcaf295cdb11587f4c9ccccd892c6a0]
#    to [12bf5ca4c6cc7a2428514e9324e672f74abe1271]
#
============================================================
--- src/model/Inventory.cpp	34a728d73f166c666e54d902b676f74903f8e2a7
+++ src/model/Inventory.cpp	db9f63fec8fdfb7ba5627df47cc5486b37c6e131
@@ -271,17 +271,21 @@ QMap<FileEntry, FileEntryList> Inventory
                 fileIds.insert(unknownPath, fileid);
             }
 
-            // at first do a simple file name check
-            if ((missingItem->getFilename() == unknownItem->getFilename()) &&
-                (missingItem->isDirectory() == unknownItem->isDirectory()))
+            // at first do a simple file name check for items of the same type
+            if (missingItem->isDirectory() == unknownItem->isDirectory())
             {
-                FileEntry can(unknownPath, unknownItem->isDirectory());
-                if (fileIds.contains(unknownPath))
+                // equal names / different paths or different names / equal paths
+                if (missingItem->getFilename() == unknownItem->getFilename() ||
+                    missingItem->getBaseDirectory() == unknownItem->getBaseDirectory())
                 {
-                    can.fileid = fileIds.value(unknownPath);
+                    FileEntry can(unknownPath, unknownItem->isDirectory());
+                    if (fileIds.contains(unknownPath))
+                    {
+                        can.fileid = fileIds.value(unknownPath);
+                    }
+                    candidates.append(can);
+                    continue;
                 }
-                candidates.append(can);
-                continue;
             }
 
             // we can't do anything for directories from here on
============================================================
--- src/view/dialogs/UnaccountedRenames.cpp	fd374b3f0fcaf295cdb11587f4c9ccccd892c6a0
+++ src/view/dialogs/UnaccountedRenames.cpp	12bf5ca4c6cc7a2428514e9324e672f74abe1271
@@ -130,6 +130,7 @@ void UnaccountedRenames::findUnaccounted
         this, SLOT(findUnaccountedRenames())
     );
 
+    show();
 }
 
 void UnaccountedRenames::itemClicked(QTreeWidgetItem * item, int column)