bug fix: process bar & charset decode

diff --git a/pgadmin/frm/frmImport.cpp b/pgadmin/frm/frmImport.cpp
index 658a1fa6fc97ad4ffaeae248e47fe13af0e78b5b..e39271aceafb5e2945385b282088f9f15370d856 100755 (executable)
--- a/pgadmin/frm/frmImport.cpp
+++ b/pgadmin/frm/frmImport.cpp
@@ -1477,7 +1477,7 @@ void frmImport::ImportData()
     //bool logwarn = chkLogWarn->GetValue();\r
     bool logstmt = chkLogStmt->GetValue();\r
     bool loginfo = chkLogInfo->GetValue();\r
-    bool logproc = chkLogInfo->GetValue();\r
+    bool logproc = chkLogProc->GetValue();\r
 \r
     int impmode = (int)chcImportMode->GetClientData(chcImportMode->GetSelection());\r
     int impdest = (int)chcImpDest->GetClientData(chcImpDest->GetSelection());\r

diff --git a/pgadmin/utils/pgcsvfile.cpp b/pgadmin/utils/pgcsvfile.cpp
index 7a7459f7ddec3debd7de1efc208340dff3d65c23..a283ceafdf64defc4847125a3389e5cf21979dfe 100755 (executable)
--- a/pgadmin/utils/pgcsvfile.cpp
+++ b/pgadmin/utils/pgcsvfile.cpp
@@ -2557,6 +2557,7 @@ bool pgCSVFile::NextLine(wxString& linedata, wxString**& linevals, int &valsnum)
             parsedrs = wxInvalidOffset;\r
             m_curfilecont.Empty();\r
             m_parsedoffset = 0;\r
+            parsedoffset = 0;\r
             m_baseoffset = TellI();\r
         }\r
         else if (m_delimitedbychar)\r