Fix a bug about test button operation.

diff --git a/execute.c b/execute.c
index 9480be4d4c3f1cd5dc610533f9dd4e1fb0aad1eb..e1a9cea277237c3cf9fb77565790da8de514256d 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -470,7 +470,7 @@ inolog("res->next=%p\n", kres);
        EnvironmentClass *env = (EnvironmentClass *) (conn->henv);
        const char *cmd = QR_get_command(res);
 
-       if (retval == SQL_SUCCESS && cmd && EN_is_odbc3(env))
+       if (retval == SQL_SUCCESS && cmd && env && EN_is_odbc3(env))
        {
            int     count;
 

diff --git a/setup.c b/setup.c
index 450e85f1c06d4edd6b310f0bf609e76e9c11f4c4..59c2d349502a78ed6dab0a670562062651f44767 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -300,6 +300,7 @@ ConfigDlgProc(HWND hdlg,
                            char *emsg;
 
                            memcpy(&conn->connInfo, &lpsetupdlg->ci, sizeof(ConnInfo));
+                           CC_initialize_pg_version(conn);
                            if (CC_connect(conn, AUTH_REQ_OK, NULL) > 0)
                            {
                                strncpy(szMsg, "Connection successful", sizeof(szMsg));