From 443d06f50deb588c0c857a3e0d0350a138907df7 Mon Sep 17 00:00:00 2001
From: Brian Ferguson <ferguson.brian@gmail.com>
Date: Sat, 18 Aug 2012 09:02:20 -0600
Subject: [PATCH] Deprecated undocumented LogViewer option (in Rainmeter.ini);
 minor code cosmetics (poiru's suggestion)

---
 Library/Rainmeter.cpp | 24 +++++++-----------------
 Library/Rainmeter.h   |  2 --
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp
index 817a32c8..19ef33ac 100644
--- a/Library/Rainmeter.cpp
+++ b/Library/Rainmeter.cpp
@@ -1283,18 +1283,18 @@ void CRainmeter::ReloadSettings()
 
 void CRainmeter::EditSettings()
 {
-	std::wstring file = L'\"' + m_IniFile;
-	file += L'\"';
+	std::wstring file = L'"' + m_IniFile;
+	file += L'"';
 	RunFile(m_SkinEditor.c_str(), file.c_str());
 }
 
 void CRainmeter::EditSkinFile(const std::wstring& name, const std::wstring& iniFile)
 {
-	std::wstring args = L'\"' + m_SkinPath;
+	std::wstring args = L'"' + m_SkinPath;
 	args += name;
 	args += L'\\';
 	args += iniFile;
-	args += L'\"';
+	args += L'"';
 	RunFile(m_SkinEditor.c_str(), args.c_str());
 }
 
@@ -2334,19 +2334,9 @@ void CRainmeter::ReadGeneralSettings(const std::wstring& iniFile)
 		m_SkinEditor = (SUCCEEDED(hr) && cchOut > 0) ? buffer : L"Notepad";
 	}
 
-	m_LogViewer = parser.ReadString(L"Rainmeter", L"LogViewer", L"");
-	if (m_LogViewer.empty())
-	{
-		// Get the program path associated with .log files
-		DWORD cchOut = MAX_PATH;
-		HRESULT hr = AssocQueryString(ASSOCF_NOTRUNCATE, ASSOCSTR_EXECUTABLE, L".log", L"open", buffer, &cchOut);
-		m_LogViewer = (SUCCEEDED(hr) && cchOut > 0) ? buffer : L"Notepad";
-	}
-
 	if (m_Debug)
 	{
 		LogWithArgs(LOG_NOTICE, L"ConfigEditor: %s", m_SkinEditor.c_str());
-		LogWithArgs(LOG_NOTICE, L"LogViewer: %s", m_LogViewer.c_str());
 	}
 
 	m_TrayExecuteR = parser.ReadString(L"Rainmeter", L"TrayExecuteR", L"", false);
@@ -3242,10 +3232,10 @@ void CRainmeter::StopLogging()
 
 void CRainmeter::ShowLogFile()
 {
-	std::wstring logFile = L'\"' + m_LogFile;
-	logFile += L'\"';
+	std::wstring logFile = L'"' + m_LogFile;
+	logFile += L'"';
 
-	RunFile(m_LogViewer.c_str(), logFile.c_str());
+	RunFile(m_SkinEditor.c_str(), logFile.c_str());
 }
 
 void CRainmeter::DeleteLogFile()
diff --git a/Library/Rainmeter.h b/Library/Rainmeter.h
index ac5a4ccf..3f277732 100644
--- a/Library/Rainmeter.h
+++ b/Library/Rainmeter.h
@@ -153,7 +153,6 @@ public:
 	const std::wstring& GetDrive() { return m_Drive; }
 
 	const std::wstring& GetSkinEditor() { return m_SkinEditor; }
-	const std::wstring& GetLogViewer() { return m_LogViewer; }
 	const std::wstring& GetStatsDate() { return m_StatsDate; }
 
 	HWND GetWindow() { return m_Window; }
@@ -312,7 +311,6 @@ private:
 	std::list<LogInfo> m_LogData;
 
 	std::wstring m_SkinEditor;
-	std::wstring m_LogViewer;
 
 	CConfigParser* m_CurrentParser;