Merge with develop
This commit is contained in:
parent
2214e6a5f0
commit
d73b6e205b
3 changed files with 7 additions and 7 deletions
|
@ -389,8 +389,8 @@ END_MESSAGE_MAP()
|
||||||
|
|
||||||
BOOL CBug_reportDlg::OnInitDialog()
|
BOOL CBug_reportDlg::OnInitDialog()
|
||||||
{
|
{
|
||||||
setReportEmailFunction ((void*)sendEmail);
|
// setReportEmailFunction ((void*)sendEmail);
|
||||||
setDefaultEmailParams ("gw.nevrax.com", "", "lecroart@nevrax.com");
|
// setDefaultEmailParams ("gw.nevrax.com", "", "lecroart@nevrax.com");
|
||||||
|
|
||||||
CDialog::OnInitDialog();
|
CDialog::OnInitDialog();
|
||||||
|
|
||||||
|
|
|
@ -436,9 +436,9 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
// Set default email value for reporting error
|
// Set default email value for reporting error
|
||||||
#ifdef TEST_CRASH_COUNTER
|
#ifdef TEST_CRASH_COUNTER
|
||||||
//initCrashReport ();
|
// initCrashReport ();
|
||||||
setReportEmailFunction ((void*)sendEmail);
|
// setReportEmailFunction ((void*)sendEmail);
|
||||||
setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
|
// setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
|
||||||
|
|
||||||
if (string(cmdline) == "/crash")
|
if (string(cmdline) == "/crash")
|
||||||
volatile int toto = *(int*)0;
|
volatile int toto = *(int*)0;
|
||||||
|
|
|
@ -846,8 +846,8 @@ void prelogInit()
|
||||||
FPU_CHECKER_ONCE
|
FPU_CHECKER_ONCE
|
||||||
|
|
||||||
// Set default email value for reporting error
|
// Set default email value for reporting error
|
||||||
setReportEmailFunction ((void*)sendEmail);
|
// setReportEmailFunction ((void*)sendEmail);
|
||||||
setDefaultEmailParams ("smtp.nevrax.com", "", "ryzombug@nevrax.com");
|
// setDefaultEmailParams ("smtp.nevrax.com", "", "ryzombug@nevrax.com");
|
||||||
|
|
||||||
// create the save dir.
|
// create the save dir.
|
||||||
if (!CFile::isExists("save")) CFile::createDirectory("save");
|
if (!CFile::isExists("save")) CFile::createDirectory("save");
|
||||||
|
|
Loading…
Reference in a new issue