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

[xestiaab/.git] / source / search / frmSearch.cpp

diff --git a/source/search/frmSearch.cpp b/source/search/frmSearch.cpp
index 6d3b891..9e4d8aa 100644 (file)
--- a/source/search/frmSearch.cpp
+++ b/source/search/frmSearch.cpp
@@ -257,7 +257,6 @@ void frmSearch::AddSearchSetting( wxCommandEvent& event )
        NewPanel->SetupPointers(this);
        NewPanel->SetupInteger(ScrollGen);
        szrSearch->Add(NewPanel, 1, wxEXPAND|wxGROW, 5);
-       //szrSearch->Fit(tabSearch);
        szrSearch->FitInside(tabSearch);
        szrSearch->Layout();
        szrSearch->RecalcSizes();
@@ -323,8 +322,6 @@ void frmSearch::RemoveSearchSetting( wxCommandEvent& event )
        delete XABSPPtr;
        XABSPPtr = NULL;
        
-       //szrSearch->Fit(tabSearch);
-       
        if (SearchFrames.size() < SEARCHSETTINGS_MAX && SearchFrames.size() > 1){
        
                for (std::map<int,void*>::iterator iter = SearchFrames.begin(); 
@@ -466,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();