From e694ac4193585d33512f7963e4f6069a51670646 Mon Sep 17 00:00:00 2001 From: Olivier Bertrand Date: Thu, 5 Dec 2013 12:32:06 +0100 Subject: [PATCH] - Suppress eventual prompting when connecting to an ODBC source modified: storage/connect/odbconn.cpp --- storage/connect/odbconn.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 78731cee22c..a4a33ebe2c4 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -1123,10 +1123,10 @@ bool ODBConn::Connect(DWORD Options) PGLOBAL& g = m_G; PDBUSER dup = PlgGetUser(g); - if (Options & noOdbcDialog || dup->Remote) +//if (Options & noOdbcDialog || dup->Remote) wConnectOption = SQL_DRIVER_NOPROMPT; - else if (Options & forceOdbcDialog) - wConnectOption = SQL_DRIVER_PROMPT; +//else if (Options & forceOdbcDialog) +// wConnectOption = SQL_DRIVER_PROMPT; rc = SQLDriverConnect(m_hdbc, hWnd, (PUCHAR)m_Connect, SQL_NTS, ConnOut, MAX_CONNECT_LEN,