From 29e1dfba5baf52cefb3ab8f85bbe1ff701504579 Mon Sep 17 00:00:00 2001 From: Kimmo Pekkola Date: Wed, 12 Aug 2009 18:02:24 +0000 Subject: [PATCH] Removed duplicated code. --- Library/Rainmeter.cpp | 23 +---------------------- revision-number.h | 2 +- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index 679ecbc7..aa7890f9 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -963,28 +963,7 @@ void CRainmeter::CreateDefaultConfigFile(std::wstring strFile) } else { - // The folder was created successfully which means that it wasn't available yet. - // Copy the default skin to the Skins folder - std::wstring strFrom(defaultIni); - std::wstring strTo(GetIniFile()); - - // The strings must end with double nul - strFrom.append(L"0"); - strFrom[strFrom.size() - 1] = L'\0'; - strTo.append(L"0"); - strTo[strTo.size() - 1] = L'\0'; - - SHFILEOPSTRUCT fo = {0}; - fo.wFunc = FO_COPY; - fo.pFrom = strFrom.c_str(); - fo.pTo = strTo.c_str(); - fo.fFlags = FOF_NO_UI; - - int result = SHFileOperation(&fo); - if (result != 0) - { - DebugLog(L"Unable to copy the default settings file %i", result); - } + CopyFiles(defaultIni, GetIniFile()); } } diff --git a/revision-number.h b/revision-number.h index 71038144..f03afe06 100644 --- a/revision-number.h +++ b/revision-number.h @@ -1,2 +1,2 @@ #pragma once -const int revision_number = 163; \ No newline at end of file +const int revision_number = 178; \ No newline at end of file