=== modified file 'setupgui/callbacks.c'
--- setupgui/callbacks.c	2009-09-24 09:57:30 +0000
+++ setupgui/callbacks.c	2009-09-24 11:14:17 +0000
@@ -81,13 +81,16 @@
   SQLWCHAR    szCatalog[MYODBC_DB_NAME_MAX];
   SQLLEN      nCatalog;
   LIST        *dbs= NULL;
-  SQLWCHAR    *preserve= params->database;
+  SQLWCHAR    *preservedDatabase= params->database;
+  BOOL        preservedNoCatalog= params->no_catalog;
 
   params->database= NULL;
+  params->no_catalog= FALSE;
 
   nReturn= Connect(&hDbc, &hEnv, params);
 
-  params->database= preserve;
+  params->database= preservedDatabase;
+  params->no_catalog= preservedNoCatalog;
 
   if (nReturn != SQL_SUCCESS)
     ShowDiagnostics(nReturn, SQL_HANDLE_DBC, hDbc);
@@ -151,13 +154,16 @@
   SQLWCHAR    szCharset[MYODBC_DB_NAME_MAX];
   SQLLEN      nCharset;
   LIST        *csl= NULL;
-  SQLWCHAR    *preserve= params->database;
-
-  params->database= NULL;
-
-  nReturn= Connect(&hDbc, &hEnv, params);
-
-  params->database= preserve;
+  SQLWCHAR    *preservedDatabase= params->database;
+  BOOL        preservedNoCatalog= params->no_catalog;
+
+  params->database= NULL;
+  params->no_catalog= FALSE;
+
+  nReturn= Connect(&hDbc, &hEnv, params);
+
+  params->database= preservedDatabase;
+  params->no_catalog= preservedNoCatalog;
 
   if (nReturn != SQL_SUCCESS)
     ShowDiagnostics(nReturn, SQL_HANDLE_DBC, hDbc);