From 1d133492ed91c50ad14d1ed797ff4a652a2d0f70 Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Mon, 13 Feb 2017 22:31:42 +0100
Subject: [PATCH] data: Fixed file node finding in search and undoing file
 activations in graph

---
 src/lib/component/controller/FeatureController.cpp | 2 +-
 src/lib/data/PersistentStorage.cpp                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/component/controller/FeatureController.cpp b/src/lib/component/controller/FeatureController.cpp
index eef4eefc..af262452 100644
--- a/src/lib/component/controller/FeatureController.cpp
+++ b/src/lib/component/controller/FeatureController.cpp
@@ -91,7 +91,7 @@ void FeatureController::handleMessage(MessageActivateNodes* message)
 
 	for (const MessageActivateNodes::ActiveNode& node : message->nodes)
 	{
-		if (!message->isReplayed() && node.nodeId)
+		if (node.nodeId)
 		{
 			nodeIds.push_back(node.nodeId);
 		}
diff --git a/src/lib/data/PersistentStorage.cpp b/src/lib/data/PersistentStorage.cpp
index 99431670..026e449e 100644
--- a/src/lib/data/PersistentStorage.cpp
+++ b/src/lib/data/PersistentStorage.cpp
@@ -1078,7 +1078,7 @@ std::vector<Id> PersistentStorage::getTokenIdsForMatches(const std::vector<Searc
 	{
 		if (match.nodeType == Node::NODE_FILE)
 		{
-			idSet.insert(m_sqliteStorage.getFileByPath(rootPath.concat(match.subtext).str()).id);
+			idSet.insert(m_sqliteStorage.getFileByPath(rootPath.concat(match.subtext).canonical().str()).id);
 		}
 		else
 		{