delay deleting save buttons, to prevent possible crash later

2 files changed, 6 insertions, 3 deletions

diff --git a/src/search/SearchView.cpp b/src/search/SearchView.cpp
index c1d6597..bee2fbb 100644
--- a/src/search/SearchView.cpp
+++ b/src/search/SearchView.cpp
@@ -517,9 +517,7 @@ void SearchView::NotifySaveListChanged(SearchModel * sender)
 	for(i = 0; i < saveButtons.size(); i++)
 	{
 		RemoveComponent(saveButtons[i]);
-		delete saveButtons[i];
 	}
-	saveButtons.clear();
 	if(!sender->GetSavesLoaded())
 	{
 		nextButton->Enabled = false;
@@ -574,6 +572,11 @@ void SearchView::NotifySaveListChanged(SearchModel * sender)
 			delete errorLabel;
 			errorLabel = NULL;
 		}
+		for(i = 0; i < saveButtons.size(); i++)
+		{
+			delete saveButtons[i];
+		}
+		saveButtons.clear();
 
 		buttonYOffset = 28;
 		buttonXOffset = buttonPadding;
diff --git a/src/tasks/Task.h b/src/tasks/Task.h
index a025ac1..f66129f 100644
--- a/src/tasks/Task.h
+++ b/src/tasks/Task.h
@@ -24,7 +24,7 @@ public:
 	std::string GetError();
 	std::string GetStatus();
 	void Poll();
-	Task() : listener(NULL) { progress = 0; }
+	Task() : listener(NULL) { progress = 0; thProgress = 0; }
 	virtual ~Task();
 protected:
 	int progress;