From d0564b5b3a732de08b5dd27644741a382905d14d Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Tue, 10 Jan 2012 15:41:16 +0400
Subject: [PATCH] fixed crash on TilingRenderPolicy when drawing CircleInfo
 from additionalSkinPage.

---
 yg/circle_info.cpp | 8 +++++++-
 yg/skin.cpp        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/yg/circle_info.cpp b/yg/circle_info.cpp
index 0ab7951e8b..4753a25321 100644
--- a/yg/circle_info.cpp
+++ b/yg/circle_info.cpp
@@ -17,7 +17,13 @@ namespace yg
      m_isOutlined(isOutlined),
      m_outlineWidth(my::rounds(outlineWidth)),
      m_outlineColor(outlineColor)
-  {}
+  {
+    if (!m_isOutlined)
+    {
+      m_outlineWidth = 0;
+      m_outlineColor = yg::Color(0, 0, 0, 0);
+    }
+  }
 
   CircleInfo::CircleInfo()
   {}
diff --git a/yg/skin.cpp b/yg/skin.cpp
index ac150576a1..57428f24e8 100644
--- a/yg/skin.cpp
+++ b/yg/skin.cpp
@@ -172,7 +172,7 @@ namespace yg
     {
       res = m_additionalPages[i]->findCircleInfo(circleInfo);
       if (res != invalidPageHandle())
-        return packID(i, res);
+        return packID(i + m_pages.size(), res);
     }
 
     if (!m_pages[m_currentDynamicPage]->hasRoom(circleInfo))