summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-09-22 13:44:21 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-09-22 13:44:21 +0000
commitd1963a84cf69f801100367871744a4e1092d2bbc (patch)
tree9054ec42e8f0643e2f75f171102659f52a00ebf8
parent116d81a67a7c93fbd0041849bc7d1b4a19aa0407 (diff)
crash fix for import in BasicHistory
git-svn-id: http://svn.miranda-ng.org/main/trunk@6181 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/BasicHistory/src/HistoryWindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp
index ccadabfe9e..60753d828e 100644
--- a/plugins/BasicHistory/src/HistoryWindow.cpp
+++ b/plugins/BasicHistory/src/HistoryWindow.cpp
@@ -2160,8 +2160,8 @@ void HistoryWindow::DoImport(IImport::ImportType type)
std::wstring err;
std::vector<HANDLE> contacts;
- for(hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
- contacts.push_back(hContact);
+ for(HANDLE _hContact = db_find_first(); _hContact != NULL; _hContact = db_find_next(_hContact))
+ contacts.push_back(_hContact);
bool changeContact = false;
HANDLE lastContact = hContact;