From acb058052294422e83d889d388a8a5c9e5dcdb50 Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Fri, 7 Feb 2014 16:18:37 +0100
Subject: changed order of actions on search timer menu items

---
 recmenuitem.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'recmenuitem.c')

diff --git a/recmenuitem.c b/recmenuitem.c
index 6527751..928883d 100644
--- a/recmenuitem.c
+++ b/recmenuitem.c
@@ -2721,13 +2721,18 @@ int cRecMenuItemSearchTimer::DrawIcons(void) {
     int iconY = (height - iconSize) / 2;
     std::string iconEdit, iconDelete, iconSearch;
     if (active) {
-        iconEdit = (iconActive==0)?"edit_active":"edit_inactive";
-        iconDelete = (iconActive==1)?"delete_active":"delete_inactive";
-        iconSearch = (iconActive==2)?"search_active":"search_inactive";
+        iconSearch = (iconActive==0)?"search_active":"search_inactive";
+        iconEdit = (iconActive==1)?"edit_active":"edit_inactive";
+        iconDelete = (iconActive==2)?"delete_active":"delete_inactive";
     } else {
+        iconSearch = "search_inactive";
         iconEdit = "edit_inactive";
         iconDelete = "delete_inactive";
-        iconSearch = "search_inactive";
+    }
+    cImage *imgSearch = imgCache.GetIcon(iconSearch, iconSize, iconSize);
+    if (imgSearch) {
+        pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgSearch);
+        iconsX += iconSize + 10;
     }
     cImage *imgEdit = imgCache.GetIcon(iconEdit, iconSize, iconSize);
     if (imgEdit) {
@@ -2739,11 +2744,6 @@ int cRecMenuItemSearchTimer::DrawIcons(void) {
         pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgDel);
         iconsX += iconSize + 10;
     }
-    cImage *imgSearch = imgCache.GetIcon(iconSearch, iconSize, iconSize);
-    if (imgSearch) {
-        pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgSearch);
-        iconsX += iconSize + 10;
-    }
     return iconsX;
 }
 
-- 
cgit v1.2.3