Log Message:
-----------
fix server menu after failed connect
Tags:
----
REL-1_2_0_PATCHES
Modified Files:
--------------
pgadmin3/src/ui:
frmMain.cpp (r1.112 -> r1.112.2.1)
Index: frmMain.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.112
retrieving revision 1.112.2.1
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.112 -r1.112.2.1
--- src/ui/frmMain.cpp
+++ src/ui/frmMain.cpp
@@no-spam -685,6 +685,7 @@no-spam
switch (res)
{
case PGCONN_OK:
+ {
StartMsg(_("Restoring previous environment"));
wxLogInfo(wxT("pgServer object initialised as required."));
browser->SetItemImage(server->GetId(), PGICON_SERVER, wxTreeItemIcon_Normal);
@@no-spam -704,7 +705,8 @@no-spam
browser->EnsureVisible(item);
}
EndMsg();
- break;
+ return res;
+ }
case PGCONN_DNSERR:
/*
// looks strange to me. Shouldn_t server be removed from the tree as well?
@@no-spam -719,6 +721,7 @@no-spam
wxLogInfo(wxT("pgServer object didn't initialise because the user aborted."));
break;
}
+ server->Disconnect();
return res;
}
[plaintext cvs-20041216114840-diff.txt]
---------------------------(end of broadcast)---------------------------
TIP 1: subscribe and unsubscribe commands go to majordomo@no-spam