Index: pgServer.cpp =================================================================== RCS file: /projects/pgadmin3/src/schema/pgServer.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -Lsrc/schema/pgServer.cpp -Lsrc/schema/pgServer.cpp -u -w -r1.52 -r1.53 --- src/schema/pgServer.cpp +++ src/schema/pgServer.cpp @@ -505,7 +505,7 @@ properties->AppendItem(_("Last system OID"), GetLastSystemOID()); } properties->AppendItem(_("Connected?"), GetConnected()); - if (GetUpSince().IsValid()) + if (GetConnected() && GetUpSince().IsValid()) properties->AppendItem(_("Up since"), GetUpSince()); if (GetServerControllable()) properties->AppendItem(_("Running?"), GetServerRunning()); Index: misc.cpp =================================================================== RCS file: /projects/pgadmin3/src/utils/misc.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -Lsrc/utils/misc.cpp -Lsrc/utils/misc.cpp -u -w -r1.60 -r1.61 --- src/utils/misc.cpp +++ src/utils/misc.cpp @@ -528,7 +528,7 @@ #if defined(__WXMSW__) || wxUSE_LIBMSPACK !wxFile::Exists(helpdir + wxT("/pgadmin3.chm")) && #endif - !wxFile::Exists(helpdir + wxT("pgadmin3.zip"))) + !wxFile::Exists(helpdir + wxT("/pgadmin3.zip"))) helpdir=docPath + wxT("/en_US"); #ifdef __WXMSW__ @@ -536,7 +536,7 @@ if (wxFile::Exists(helpdir + wxT("/pgadmin3.chm"))) { helpCtl=new wxCHMHelpController(); - helpCtl->Initialize(helpdir); + helpCtl->Initialize(helpdir + wxT("/pgadmin3")); } else #endif