PluginUpdater:

-Now the custom URL is remembered when changing the update mode in Options
-Cleaned up popup Options
-Fixed Restart MessageBox after silent update
-code reordering

git-svn-id: http://svn.miranda-ng.org/main/trunk@9958 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 3 insertions, 6 deletions

diff --git a/plugins/PluginUpdater/src/unzipfile.cpp b/plugins/PluginUpdater/src/unzipfile.cpp
index b29e7e1193..24da1147a4 100644
--- a/plugins/PluginUpdater/src/unzipfile.cpp
+++ b/plugins/PluginUpdater/src/unzipfile.cpp
@@ -45,7 +45,7 @@ void BackupFile(TCHAR *ptszSrcFileName, TCHAR *ptszBackFileName)
 	SafeMoveFile(ptszSrcFileName, ptszBackFileName);

 }

 

-bool extractCurrentFile(unzFile uf, TCHAR *ptszDestPath, TCHAR *ptszBackPath, bool ch)

+bool extractCurrentFile(unzFile uf, TCHAR *ptszDestPath, TCHAR *ptszBackPath)

 {

 	unz_file_info64 file_info;

 	char filename[MAX_PATH], buf[8192];

@@ -57,9 +57,6 @@ bool extractCurrentFile(unzFile uf, TCHAR *ptszDestPath, TCHAR *ptszBackPath, bo
 	for (char *p = strchr(filename, '/'); p; p = strchr(p+1, '/'))

 		*p = '\\';

 

-	if (ch && !db_get_b(NULL, MODNAME "Files", StrToLower(ptrA(mir_strdup(filename))), 1))

-		return true;

-

 	TCHAR tszDestFile[MAX_PATH], tszBackFile[MAX_PATH];

 	TCHAR *ptszNewName = mir_utf8decodeT(filename);

 	if (ptszNewName == NULL)

@@ -121,7 +118,7 @@ bool extractCurrentFile(unzFile uf, TCHAR *ptszDestPath, TCHAR *ptszBackPath, bo
 	return true;

 }

 

-bool unzip(const TCHAR *ptszZipFile, TCHAR *ptszDestPath, TCHAR *ptszBackPath,bool ch)

+bool unzip(const TCHAR *ptszZipFile, TCHAR *ptszDestPath, TCHAR *ptszBackPath)

 {

 	bool bResult = true;

 

@@ -131,7 +128,7 @@ bool unzip(const TCHAR *ptszZipFile, TCHAR *ptszDestPath, TCHAR *ptszBackPath,bo
 	unzFile uf = unzOpen2_64(ptszZipFile, &ffunc);

 	if (uf) {

 		do {

-			if (!extractCurrentFile(uf, ptszDestPath, ptszBackPath,ch))

+			if (!extractCurrentFile(uf, ptszDestPath, ptszBackPath))

 				bResult = false;

 		}

 			while (unzGoToNextFile(uf) == UNZ_OK);