From db232c996751a3b34b07b26cdf6497b6c610fffb Mon Sep 17 00:00:00 2001
From: "U-QUAN-W4\\Administrator" <Administrator@QUAN-W4.(none)>
Date: Mon, 29 Mar 2010 20:38:16 +0800
Subject: [PATCH] bug fix: process bar & charset decode

---
 pgadmin/frm/frmImport.cpp   | 2 +-
 pgadmin/utils/pgcsvfile.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pgadmin/frm/frmImport.cpp b/pgadmin/frm/frmImport.cpp
index 658a1fa6f..e39271ace 100755
--- a/pgadmin/frm/frmImport.cpp
+++ b/pgadmin/frm/frmImport.cpp
@@ -1477,7 +1477,7 @@ void frmImport::ImportData()
     //bool logwarn = chkLogWarn->GetValue();
     bool logstmt = chkLogStmt->GetValue();
     bool loginfo = chkLogInfo->GetValue();
-    bool logproc = chkLogInfo->GetValue();
+    bool logproc = chkLogProc->GetValue();
 
     int impmode = (int)chcImportMode->GetClientData(chcImportMode->GetSelection());
     int impdest = (int)chcImpDest->GetClientData(chcImpDest->GetSelection());
diff --git a/pgadmin/utils/pgcsvfile.cpp b/pgadmin/utils/pgcsvfile.cpp
index 7a7459f7d..a283ceafd 100755
--- 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;
             m_curfilecont.Empty();
             m_parsedoffset = 0;
+            parsedoffset = 0;
             m_baseoffset = TellI();
         }
         else if (m_delimitedbychar)
-- 
2.39.5