src: revert git auto merge fail

2017-08-10 13:41:43 +02:00
parent 37ead804bf
commit eaf9df8551
3 changed files with 36 additions and 2 deletions
@@ -277,7 +277,7 @@ void Application::handleMessage(MessageLoadProject* message)

 	if (m_project && projectSettingsFilePath == m_project->getProjectSettingsFilePath())
 	{
-		if (message->forceRefresh)
+		if (message->forceRefresh && m_hasGUI)
 		{
 			m_project->setStateSettingsUpdated();
 			refreshProject(false);
@@ -285,6 +285,15 @@ void Application::handleMessage(MessageLoadProject* message)
 		return;
 	}
 	createAndLoadProject(projectSettingsFilePath);
+
+	if (message->forceRefresh)
+	{
+		refreshProject(true);
+	}
+	else if (!m_hasGUI)
+	{
+		refreshProject(false);
+	}
 }

 void Application::handleMessage(MessageRefresh* message)