From 216d58da31665405afa83ed84bd42e64881b507a Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Fri, 13 Jul 2012 21:29:30 +0300
Subject: [PATCH] Fixed animated cursor issue

---
 Library/Mouse.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Library/Mouse.cpp b/Library/Mouse.cpp
index 1357ced7..7ac6c607 100644
--- a/Library/Mouse.cpp
+++ b/Library/Mouse.cpp
@@ -86,29 +86,30 @@ void CMouse::ReadOptions(CConfigParser& parser, const WCHAR* section, CMeterWind
 	}
 	else if (wcschr(mouseCursor, L'.'))
 	{
-		// Load custom cursor
+		m_CursorType = MOUSECURSOR_CUSTOM;
+	}
+	else
+	{
+		// Inherit from [Rainmeter].
+		m_CursorType = meterWindow->GetMouse().m_CursorType;
+		if (m_CursorType == MOUSECURSOR_CUSTOM)
+		{
+			mouseCursor = meterWindow->GetParser().ReadString(L"Rainmeter", L"MouseActionCursor", L"").c_str();;
+		}
+	}
+
+	if (m_CursorType == MOUSECURSOR_CUSTOM)
+	{
 		std::wstring cursorPath = meterWindow->GetResourcesPath();
 		cursorPath += L"Cursors\\";
 		cursorPath += mouseCursor;
 		m_CustomCursor = LoadCursorFromFile(cursorPath.c_str());
-		if (m_CustomCursor)
-		{
-			m_CursorType = MOUSECURSOR_CUSTOM;
-		}
-		else
+		if (!m_CustomCursor)
 		{
 			m_CursorType = MOUSECURSOR_ARROW;
 			LogWithArgs(LOG_ERROR, L"Invalid cursor: %s", cursorPath.c_str());
 		}
 	}
-	else
-	{
-		m_CursorType = meterWindow->GetMouse().m_CursorType;
-		if (meterWindow->GetMouse().m_CustomCursor)
-		{
-			m_CustomCursor = CopyCursor(meterWindow->GetMouse().m_CustomCursor);
-		}
-	}
 }
 
 HCURSOR CMouse::GetCursor() const