Skip to content
This repository has been archived by the owner on Sep 15, 2022. It is now read-only.

Commit

Permalink
Fix a crash if pressing escape in the edit grid filter and sorting di…
Browse files Browse the repository at this point in the history
…alogue
  • Loading branch information
dpage committed Sep 23, 2010
1 parent c78b95d commit 6a57828
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Changes

Date Dev Ver Change details
---------- --- ------ --------------
2010-09-23 DP 1.12.1 Fix a crash if pressing escape in the edit grid filter
and sorting dialogue.
2010-09-15 AV 1.12.0 Fix a possible crash on Solaris when closing the
server status windows.
2010-09-15 AV 1.12.0 Fix a possible crash on Solaris when cancelling a
Expand Down
2 changes: 2 additions & 0 deletions pgadmin/frm/frmEditGrid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ frmEditGrid::frmEditGrid(frmMain *form, const wxString& _title, pgConn *_conn, p
SetStatusBarPane(-1);

sqlGrid = new ctlSQLEditGrid(this, CTL_EDITGRID, wxDefaultPosition, wxDefaultSize);
sqlGrid->SetTable(0);
#ifdef __WXMSW__
sqlGrid->SetDefaultRowSize(sqlGrid->GetDefaultRowSize()+2, true);
#endif
Expand Down Expand Up @@ -1234,6 +1235,7 @@ void frmEditGrid::ShowForm(bool filter)
if (abort) {
// Hack to ensure there's a table for ~wxGrid() to delete
sqlGrid->CreateGrid(0, 0);
sqlGrid->SetTable(0);
Close();
Destroy();
} else {
Expand Down

0 comments on commit 6a57828

Please sign in to comment.