ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: revert git auto merge fail

Browse Source
This commit is contained in:
Andreas Stallinger
2017-08-10 13:41:43 +02:00
parent 37ead804bf
commit eaf9df8551
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/Application.cpp
+10 -1
View File
@@ -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)
src/lib/data/TaskFinishParsing.cpp
-1
View File
@@ -3,7 +3,6 @@
#include "component/view/DialogView.h"
#include "data/storage/PersistentStorage.h"
#include "utility/messaging/type/MessageFinishedParsing.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/messaging/type/MessageQuitApplication.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/scheduling/Blackboard.h"