Thread: SVN Commit by dpage: r4607 - in trunk/pgadmin3: . src/frm

Author: dpage
Date: 2005-10-24 13:47:18 +0100 (Mon, 24 Oct 2005)
New Revision: 4607

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/frm/frmBackup.cpp
   trunk/pgadmin3/src/frm/frmRestore.cpp
Log:
Prevent attempts to backup or restore is pg_dump/pg_restore cannot be found.

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-10-24 12:04:24 UTC (rev 4606)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-10-24 12:47:18 UTC (rev 4607)
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2005-10-24 DP  1.4B4 Prevent attempts to backup or restore is pg_dump/pg_restore cannot be found.
     <li>2005-10-23 AP  1.4B4 Fix crash when extracting schema from slony cluster
     <li>2005-10-22 AP  1.4B4 Fix New.. context menu
     <li>2005-10-21 AP  1.4B4 Fix Create a.. toolbar button on collection (r: Li Fei)

Modified: trunk/pgadmin3/src/frm/frmBackup.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmBackup.cpp    2005-10-24 12:04:24 UTC (rev 4606)
+++ trunk/pgadmin3/src/frm/frmBackup.cpp    2005-10-24 12:47:18 UTC (rev 4607)
@@ -286,5 +286,7 @@

 bool backupFactory::CheckEnable(pgObject *obj)
 {
-    return obj && obj->CanBackup();
+    extern wxString backupExecutable;
+
+    return obj && obj->CanBackup() && !backupExecutable.IsEmpty();
 }

Modified: trunk/pgadmin3/src/frm/frmRestore.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmRestore.cpp    2005-10-24 12:04:24 UTC (rev 4606)
+++ trunk/pgadmin3/src/frm/frmRestore.cpp    2005-10-24 12:47:18 UTC (rev 4607)
@@ -463,5 +463,7 @@

 bool restoreFactory::CheckEnable(pgObject *obj)
 {
-    return obj && obj->CanRestore();
+    extern wxString restoreExecutable;
+
+    return obj && obj->CanRestore() && !restoreExecutable.IsEmpty();
 }