From 3bbb613609075f8f57837910f62a4e51a1b539e8 Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Thu, 8 Jan 2015 23:57:10 +0100
Subject: [PATCH] fixed bug in displayvolumeview

---
 HISTORY                                    | 1 +
 skins/blackhole/xmlfiles/displayvolume.xml | 2 +-
 views/displayvolumeview.c                  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index a9bcac2..b5292e7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -140,3 +140,4 @@ Version 0.1.2
 
 - display only active remote timers in main menu
 - fixed two possible null pointer accesses in displaymenurootview
+- fixed bug in displayvolumeview
diff --git a/skins/blackhole/xmlfiles/displayvolume.xml b/skins/blackhole/xmlfiles/displayvolume.xml
index 1b886ad..3415a4b 100644
--- a/skins/blackhole/xmlfiles/displayvolume.xml
+++ b/skins/blackhole/xmlfiles/displayvolume.xml
@@ -23,7 +23,7 @@
             <drawtext align="center" valign="center" color="{clrWhite}" font="{semibold}" fontsize="80%" text="{volume} / {maxvolume}" />
         </area>
         <area x="0" y="0" width="100%" height="100%" layer="5">
-            <drawimage imagetype="skinpart" path="tachohands/perc_{volpercent}" x="{areawidth}*0.059" y="{areawidth}*0.059" width="{areawidth}*0.882" height="{areawidth}*0.882"/>
+            <drawimage imagetype="skinpart" path="tachohands/perc_{volumepercent}" x="{areawidth}*0.059" y="{areawidth}*0.059" width="{areawidth}*0.882" height="{areawidth}*0.882"/>
         </area>
         <area x="0" y="80%" width="20%" height="20%" layer="5">
             <drawimage condition="gt({volpercent}, 74)" imagetype="icon" path="ico_volume_full" align="center" valign="center" width="90%" height="90%"/>
diff --git a/views/displayvolumeview.c b/views/displayvolumeview.c
index 4ab2fdd..e3700dd 100644
--- a/views/displayvolumeview.c
+++ b/views/displayvolumeview.c
@@ -40,7 +40,7 @@ void cDisplayVolumeView::DrawVolume(int current, int total, bool mute) {
 
     intTokens.insert(pair<string,int>("volume", current));
     intTokens.insert(pair<string,int>("maxvolume", total));
-    intTokens.insert(pair<string,int>("volpercent", (double)current *100 / (double)total));
+    intTokens.insert(pair<string,int>("volumepercent", (double)current *100 / (double)total));
     intTokens.insert(pair<string,int>("mute", mute));
 
     ClearViewElement(veVolume);