Fix the log crash bugs by ensuring we don't try to read deleted memory

nixeagle · Feb 11, 2012 · 12070eb · 12070eb
1 parent b927bca
commit 12070eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/Shared/config.h b/src/Shared/config.h
@@ -1,6 +1,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define VERSION QString("1.0.53")
+#define VERSION QString("1.0.54a2")
 
 #endif // CONFIG_H
diff --git a/src/Teambuilder/basebattlewindow.cpp b/src/Teambuilder/basebattlewindow.cpp
@@ -307,6 +307,9 @@ QString BaseBattleWindow::name(int spot) const
 
 void BaseBattleWindow::checkAndSaveLog()
 {
+    if(reinterpret_cast<size_t>(log) == 0) {
+        return; // log was already deleted from a prior call.
+    }
     log->pushList(test->getLog()->getLog());
     log->pushHtml("</body>");
     replay->setBinary(replayData.data);

diff --git a/src/Teambuilder/battlewindow.cpp b/src/Teambuilder/battlewindow.cpp
@@ -422,6 +422,7 @@ void BattleWindow::disable()
     disconnect(myclose);
     connect(myclose, SIGNAL(clicked()), this, SLOT(deleteLater()));
     BaseBattleWindow::disable();
+    setEnabled(true);
 }
 
 void BattleWindow::disableAll()