From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 15 Jan 2017 19:46:46 +0000 (+0000)
Subject: frmSearch: Event posting shouldn't happen when in search mode.
X-Git-Tag: release-0.18~38
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=9802970e8be1fe9511ad9a9d0eb9ffe8d2cfea41

frmSearch: Event posting shouldn't happen when in search mode.
---

diff --git a/source/search/frmSearch.cpp b/source/search/frmSearch.cpp
index d224764..9e4d8aa 100644
--- a/source/search/frmSearch.cpp
+++ b/source/search/frmSearch.cpp
@@ -463,20 +463,24 @@ void frmSearch::CloseWindow( wxCloseEvent& event ){
 	
 	// Close window.
 	
-	WindowData *WData = new WindowData;
+	if (SearchMode == false){
+	
+		WindowData *WData = new WindowData;
 
-	WData->DataType = 2;
-	WData->WindowPointer = this;
-	WData->WindowID = SearchUID;
+		WData->DataType = 2;
+		WData->WindowPointer = this;
+		WData->WindowID = SearchUID;
 
-	wxCommandEvent delevent(WINDOW_CLOSE);
-	delevent.SetClientData(WData);
-	wxPostEvent(GetParent(), delevent);
+		wxCommandEvent delevent(WINDOW_CLOSE);
+		delevent.SetClientData(WData);
+		wxPostEvent(GetParent(), delevent);
 		
-	wxCommandEvent rs(CE_REMOVESEARCH);
-	wxPostEvent(this, rs);
+		wxCommandEvent rs(CE_REMOVESEARCH);
+		wxPostEvent(this, rs);
 	
-	WData = NULL;
+		WData = NULL;
+		
+	}
 	
 	this->Destroy();