Merge with develop

This commit is contained in:
kervala 2015-03-24 15:30:58 +01:00
parent 2214e6a5f0
commit d73b6e205b
3 changed files with 7 additions and 7 deletions

View file

@ -389,8 +389,8 @@ END_MESSAGE_MAP()
BOOL CBug_reportDlg::OnInitDialog()
{
setReportEmailFunction ((void*)sendEmail);
setDefaultEmailParams ("gw.nevrax.com", "", "lecroart@nevrax.com");
// setReportEmailFunction ((void*)sendEmail);
// setDefaultEmailParams ("gw.nevrax.com", "", "lecroart@nevrax.com");
CDialog::OnInitDialog();

View file

@ -437,8 +437,8 @@ int main(int argc, char **argv)
// Set default email value for reporting error
#ifdef TEST_CRASH_COUNTER
// initCrashReport ();
setReportEmailFunction ((void*)sendEmail);
setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
// setReportEmailFunction ((void*)sendEmail);
// setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
if (string(cmdline) == "/crash")
volatile int toto = *(int*)0;

View file

@ -846,8 +846,8 @@ void prelogInit()
FPU_CHECKER_ONCE
// Set default email value for reporting error
setReportEmailFunction ((void*)sendEmail);
setDefaultEmailParams ("smtp.nevrax.com", "", "ryzombug@nevrax.com");
// setReportEmailFunction ((void*)sendEmail);
// setDefaultEmailParams ("smtp.nevrax.com", "", "ryzombug@nevrax.com");
// create the save dir.
if (!CFile::isExists("save")) CFile::createDirectory("save");