From 621b17e28fbb7659bc1a5828febc81bd2a17b226 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 14 Dec 2014 12:53:58 +0000
Subject: merge

git-svn-id: http://svn.miranda-ng.org/main/trunk@11403 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MRA/src/Mra_functions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'protocols/MRA/src/Mra_functions.cpp')

diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 154eed96dc..ab7331934f 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -631,7 +631,7 @@ DWORD CMraProto::MraSetContactStatus(MCONTACT hContact, DWORD dwNewStatus)
 	return dwOldStatus;
 }
 
-void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &pszSubject, DWORD dwDate, DWORD dwUIDL, bool force_display)
+void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &pszSubject, bool force_display)
 {
 	BOOL bTrayIconNewMailNotify;
 	WCHAR szStatusText[MAX_SECONDLINE];
@@ -1249,10 +1249,10 @@ DWORD FindFile(LPWSTR lpszFolder, DWORD dwFolderLen, LPWSTR lpszFileName, DWORD
 			szPath[dwPathLen] = 0;
 			mir_tstrcat(szPath, _T("*.*"));
 
+			dwRetErrorCode = ERROR_FILE_NOT_FOUND;
 			prdsiItems[dwRecDeepCurPos].dwFileNameLen = 0;
 			prdsiItems[dwRecDeepCurPos].hFind = FindFirstFileEx(szPath, FindExInfoStandard, &prdsiItems[dwRecDeepCurPos].w32fdFindFileData, FindExSearchNameMatch, NULL, 0);
 			if (prdsiItems[dwRecDeepCurPos].hFind != INVALID_HANDLE_VALUE) {
-				dwRetErrorCode = ERROR_FILE_NOT_FOUND;
 				do {
 					dwPathLen -= prdsiItems[dwRecDeepCurPos].dwFileNameLen;
 
-- 
cgit v1.2.3