SVN Commit by dpage: r4548 - in trunk/pgadmin3: . src/base

Author: dpage
Date: 2005-10-14 23:46:11 +0100 (Fri, 14 Oct 2005)
New Revision: 4548

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/base/sysLogger.cpp
Log:
Prevent errors in the logger causing crashes


Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-10-14 22:35:58 UTC (rev 4547)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-10-14 22:46:11 UTC (rev 4548)
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2005-10-14 DP  1.4B3 Prevent errors in the logger causing crashes
     <li>2005-10-14 DP  1.4B3 Use a sensible default location for the logfile
     <li>2005-10-12 AP  1.4B3 Fix count crash on tables (r: Merlin Moncure)
     <li>2005-10-12 AP  1.4B3 Fix slony detection on tables for pgsql7.x

Modified: trunk/pgadmin3/src/base/sysLogger.cpp
===================================================================
--- trunk/pgadmin3/src/base/sysLogger.cpp    2005-10-14 22:35:58 UTC (rev 4547)
+++ trunk/pgadmin3/src/base/sysLogger.cpp    2005-10-14 22:46:11 UTC (rev 4548)
@@ -181,6 +181,9 @@
 {
     wxString pid, logfile;

+    // Disable logging to prevent recursion in the event of a problem
+    wxLogNull foo;
+
     pid.Printf(wxT("%ld"), wxGetProcessId());
     logfile.Printf(wxT("%s"), logFile.c_str());
     logfile.Replace(wxT("%ID"), pid);