Fix majors memory leaks (TODO: shared_ptr for Game objects and implement ~Game())

2 files changed, 9 insertions, 2 deletions

diff --git a/src/game_tab/right_panel/LiveEngineDialog.cpp b/src/game_tab/right_panel/LiveEngineDialog.cpp
index 1f509ae..73d3eb3 100644
--- a/src/game_tab/right_panel/LiveEngineDialog.cpp
+++ b/src/game_tab/right_panel/LiveEngineDialog.cpp
@@ -13,6 +13,13 @@ LiveEngineDialog::LiveEngineDialog(wxWindow *parent, std::string engine_name)
   Bind(wxEVT_CLOSE_WINDOW, &LiveEngineDialog::OnClose, this);
 }
 
+LiveEngineDialog::~LiveEngineDialog() {
+  if (engine != NULL) {
+    wxLogDebug("LiveEngineDialog destructor: delete engine");
+    delete engine;
+  }
+}
+
 void LiveEngineDialog::InitEngine() {
   if (engine == NULL) {
     wxLogDebug("Start engine: %s", engine_name);
@@ -51,9 +58,8 @@ void LiveEngineDialog::OnClose(wxCloseEvent &e) {
     timer.Stop();
     engine->stop();
     engine->quit();
-    delete engine;
   }
-  e.Skip();
+  Destroy();
 }
 
 void LiveEngineDialog::SetFEN(std::string fen) {
diff --git a/src/game_tab/right_panel/LiveEngineDialog.hpp b/src/game_tab/right_panel/LiveEngineDialog.hpp
index 999002f..0996ba0 100644
--- a/src/game_tab/right_panel/LiveEngineDialog.hpp
+++ b/src/game_tab/right_panel/LiveEngineDialog.hpp
@@ -10,6 +10,7 @@ class LiveEngineDialog : public DialogLiveEngine {
 
 public:
   LiveEngineDialog(wxWindow *parent, std::string engine_name);
+  ~LiveEngineDialog();
   void InitEngine();
   void TogglePauseEngine(wxCommandEvent &event);
   void OnTimerTick(wxTimerEvent &event);