From 04a5abdf98250f20822e447afe316a887e11bc0b Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Mon, 20 Feb 2017 11:24:01 +0100
Subject: [PATCH] data: Fixed file id retrieval for file in search match

---
 src/lib/data/PersistentStorage.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib/data/PersistentStorage.cpp b/src/lib/data/PersistentStorage.cpp
index 026e449e..9d18483e 100644
--- a/src/lib/data/PersistentStorage.cpp
+++ b/src/lib/data/PersistentStorage.cpp
@@ -1078,7 +1078,13 @@ std::vector<Id> PersistentStorage::getTokenIdsForMatches(const std::vector<Searc
 	{
 		if (match.nodeType == Node::NODE_FILE)
 		{
-			idSet.insert(m_sqliteStorage.getFileByPath(rootPath.concat(match.subtext).canonical().str()).id);
+			FilePath path(match.subtext);
+			if (!path.isAbsolute())
+			{
+				path = rootPath.concat(path).canonical();
+			}
+
+			idSet.insert(m_sqliteStorage.getFileByPath(path.str()).id);
 		}
 		else
 		{