SVN Commit by andreas: r4411 - in trunk/pgadmin3/src: frm main

Author: andreas
Date: 2005-08-21 12:57:39 +0100 (Sun, 21 Aug 2005)
New Revision: 4411

Modified:
trunk/pgadmin3/src/frm/frmOptions.cpp
trunk/pgadmin3/src/main/events.cpp
Log:
fix destructor error

Modified: trunk/pgadmin3/src/frm/frmOptions.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmOptions.cpp 2005-08-21 11:53:02 UTC (rev 4410)
+++ trunk/pgadmin3/src/frm/frmOptions.cpp 2005-08-21 11:57:39 UTC (rev 4411)
@@ -314,5 +314,5 @@
{
frmOptions *frm=new frmOptions(form);
frm->Show();
- return frm;
+ return 0;
}

Modified: trunk/pgadmin3/src/main/events.cpp
===================================================================
--- trunk/pgadmin3/src/main/events.cpp 2005-08-21 11:53:02 UTC (rev 4410)
+++ trunk/pgadmin3/src/main/events.cpp 2005-08-21 11:57:39 UTC (rev 4411)
@@ -108,6 +108,11 @@
while ((node=frames.GetFirst()) != NULL)
{
fr=node->GetData();
+
+ // if crashes occur here when closing the app,
+ // some actionFactory::StartDialog returned a wxWindow* (which is registered in frames)
+ // without code to handle OnClose (esp. removing itself with RemoveFrame)
+
if (!fr->Close(!event.CanVeto()))
{
if (event.CanVeto())