Merge branch 'feature_crashreport' into develop

This commit is contained in:
Jan Dalheimer 2014-05-21 15:57:34 +02:00
commit fc3c0b0971
11 changed files with 571 additions and 1 deletions

View file

@ -709,6 +709,11 @@ void MainWindow::setCatBackground(bool enabled)
void MainWindow::on_actionAddInstance_triggered()
{
#ifdef TEST_SEGV
// For further testing stuff.
int v = *((int*)-1);
#endif
if (!MMC->minecraftlist()->isLoaded() && m_versionLoadTask &&
m_versionLoadTask->isRunning())
{