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

logic: release fixes

Browse Source 
* disable windows error dialogs on application crash for indexer target
* show indexing dialog at the start of indexing task instead of waiting for processes to start
* fix escaping path to binary for indexer process
* join garbagecollector thread when stopping
* fix compile errors related to FilePath in deploy mode on windows
This commit is contained in:
malte_langkabel
2017-05-05 16:37:48 +02:00
parent 562e623930
commit e8a24d3d98
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/platform_includes/includesWindows.h
+6 -6
View File
@@ -30,7 +30,7 @@ void setupApp(int argc, char *argv[])
{
path += "Sourcetrail/";
}
UserPaths::setUserDataPath(path);
UserPaths::setUserDataPath(FilePath(path));
#else
std::string path = QDir::currentPath().toStdString();
path += "/user/";
@@ -41,20 +41,20 @@ void setupApp(int argc, char *argv[])
#ifdef DEPLOY
// try to find files in Coati installation to migrate to Sourcetrail
FilePath coatiUserDataPath = UserPaths::getUserDataPath() + "../";
FilePath coatiUserDataPath = UserPaths::getUserDataPath().concat(FilePath("../"));
if (utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_64)
{
coatiUserDataPath = coatiUserDataPath.concat("Coati 64-bit");
coatiUserDataPath = coatiUserDataPath.concat(FilePath("Coati 64-bit"));
}
else
{
coatiUserDataPath = coatiUserDataPath.concat("Coati");
coatiUserDataPath = coatiUserDataPath.concat(FilePath("Coati"));
}
if (coatiUserDataPath.exists())
{
FileSystem::copyFile(coatiUserDataPath.concat("ApplicationSettings.xml"), UserPaths::getAppSettingsPath());
FileSystem::copyFile(coatiUserDataPath.concat("window_settings.ini"), UserPaths::getWindowSettingsPath());
FileSystem::copyFile(coatiUserDataPath.concat(FilePath("ApplicationSettings.xml")), UserPaths::getAppSettingsPath());
FileSystem::copyFile(coatiUserDataPath.concat(FilePath("window_settings.ini")), UserPaths::getWindowSettingsPath());
}
#endif