From 06676eda662dcce3c32ae87268b01d86db7b1b3f Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Thu, 9 Feb 2017 13:37:40 +0100 Subject: [PATCH] logic: Fixed comparing of project files to ignore carriage return characters --- src/lib/Project.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/Project.cpp b/src/lib/Project.cpp index e8f935f6..d5885f8c 100644 --- a/src/lib/Project.cpp +++ b/src/lib/Project.cpp @@ -209,7 +209,8 @@ void Project::load() { m_state = PROJECT_STATE_OUTVERSIONED; } - else if (TextAccess::createFromFile(projectSettingsPath.str())->getText() != m_storage->getProjectSettingsText()) + else if (utility::replace(TextAccess::createFromFile(projectSettingsPath.str())->getText(), "\r", "") != + utility::replace(TextAccess::createFromString(m_storage->getProjectSettingsText())->getText(), "\r", "")) { m_state = PROJECT_STATE_OUTDATED; canLoad = true;