razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #1149 from manongjohn/fix_crashrpt_initialization

Browse source 
Fix crashrpt initialization creating bad directories
This commit is contained in:
manongjohn 2023-04-06 07:34:02 -04:00 committed by GitHub
commit 3136cceae8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
toonz/sources/toonz/main.cpp
View file

@ -254,12 +254,6 @@ static void script_output(int type, const QString &value) {
}
//-----------------------------------------------------------------------------
#ifdef WITH_CRASHRPT
LPCWSTR convertToLPCWSTR(std::string str) {
std::wstring stemp = std::wstring(str.begin(), str.end());
return stemp.c_str();
}
#endif
int main(int argc, char *argv[]) {
#ifdef Q_OS_WIN
@ -583,15 +577,26 @@ int main(int argc, char *argv[]) {
initToonzEnv(argumentPathValues);
#ifdef WITH_CRASHRPT
std::string str;
CR_INSTALL_INFO pInfo;
memset(&pInfo, 0, sizeof(CR_INSTALL_INFO));
pInfo.cb = sizeof(CR_INSTALL_INFO);
pInfo.pszAppName = convertToLPCWSTR(TEnv::getApplicationName());
pInfo.pszAppVersion = convertToLPCWSTR(TEnv::getApplicationVersion());
pInfo.cb = sizeof(CR_INSTALL_INFO);
str = TEnv::getApplicationName();
std::wstring wAppName = std::wstring(str.begin(), str.end());
pInfo.pszAppName = wAppName.c_str();
str = TEnv::getApplicationVersion();
std::wstring wAppVersion = std::wstring(str.begin(), str.end());
pInfo.pszAppVersion = wAppVersion.c_str();
TFilePath crashrptCache =
ToonzFolder::getCacheRootFolder() + TFilePath("crashrpt");
pInfo.pszErrorReportSaveDir =
convertToLPCWSTR(crashrptCache.getQString().toStdString());
ToonzFolder::getCacheRootFolder() + TFilePath("crashrpt");
str = crashrptCache.getQString().toStdString();
std::wstring wRptdir = std::wstring(str.begin(), str.end());
pInfo.pszErrorReportSaveDir = wRptdir.c_str();
// Install all available exception handlers.
// Don't send reports automaticall, store locally
pInfo.dwFlags |= CR_INST_ALL_POSSIBLE_HANDLERS | CR_INST_DONT_SEND_REPORT;