Author: andreas Date: 2005-10-20 15:49:49 +0100 (Thu, 20 Oct 2005) New Revision: 4583
Modified: trunk/pgadmin3/CHANGELOG.txt trunk/pgadmin3/src/frm/frmQuery.cpp trunk/pgadmin3/src/include/pgDatabase.h Log: Fix Maintenance crash of disconnected DBs Modified: trunk/pgadmin3/CHANGELOG.txt =================================================================== --- trunk/pgadmin3/CHANGELOG.txt 2005-10-20 14:35:22 UTC (rev 4582) +++ trunk/pgadmin3/CHANGELOG.txt 2005-10-20 14:49:49 UTC (rev 4583) @@ -17,6 +17,7 @@ </ul> <br> <ul> + <li>2005-10-20 AP 1.4B4 Fix Maintenance crash of disconnected DBs (r: A.J.Langereis) <li>2005-10-20 AP 1.4B4 Fix Unicode/pgsql80win32 hint (r: Oryza Triznyak) <li>2005-10-20 DP 1.4B4 Ensure the user can cancel the maintenance dialogue when it is running. <li>2005-10-20 DP 1.4B4 Fix the recent files list on the config file editor. (r: Miha Radej) Modified: trunk/pgadmin3/src/frm/frmQuery.cpp =================================================================== --- trunk/pgadmin3/src/frm/frmQuery.cpp 2005-10-20 14:35:22 UTC (rev 4582) +++ trunk/pgadmin3/src/frm/frmQuery.cpp 2005-10-20 14:49:49 UTC (rev 4583) @@ -1301,5 +1301,5 @@ bool queryToolFactory::CheckEnable(pgObject *obj) { - return obj && obj->GetDatabase() != 0; + return obj && obj->GetDatabase() && obj->GetDatabase()->GetConnected(); } Modified: trunk/pgadmin3/src/include/pgDatabase.h =================================================================== --- trunk/pgadmin3/src/include/pgDatabase.h 2005-10-20 14:35:22 UTC (rev 4582) +++ trunk/pgadmin3/src/include/pgDatabase.h 2005-10-20 14:49:49 UTC (rev 4583) @@ -73,7 +73,7 @@ wxArrayString GetSlonyClusters(ctlTree *browser); bool DropObject(wxFrame *frame, ctlTree *browser, bool cascaded); - bool CanMaintenance() { return true; } + bool CanMaintenance() { return GetConnected(); } bool CanBackup() { return connected; } bool CanRestore() { return connected; } bool GetCanHint(); ---------------------------(end of broadcast)--------------------------- TIP 2: Don't 'kill -9' the postmaster