From f75ac7282650c397f9625945056750a79b2ee094 Mon Sep 17 00:00:00 2001
From: "fix94.1" <fix94.1@gmail.com>
Date: Tue, 1 May 2012 12:32:14 +0000
Subject: [PATCH] -reverted changes of r282 again since categories working now
 with emulator coverflow

---
 source/gui/coverflow.cpp  | 7 -------
 source/gui/coverflow.hpp  | 2 --
 source/menu/menu_main.cpp | 4 +---
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/source/gui/coverflow.cpp b/source/gui/coverflow.cpp
index 774dd63f..a63813d9 100644
--- a/source/gui/coverflow.cpp
+++ b/source/gui/coverflow.cpp
@@ -1701,11 +1701,6 @@ void CCoverFlow::_instantTarget(int i)
 	cvr.txtColor = cvr.txtTargetColor;
 }
 
-bool CCoverFlow::_sortByMagic(CItem item1, CItem item2)
-{
-	return (item1.hdr->hdr.magic == item2.hdr->hdr.magic) ? _sortByAlpha(item1, item2) : item1.hdr->hdr.magic > item2.hdr->hdr.magic;
-}
-
 bool CCoverFlow::_sortByPlayCount(CItem item1, CItem item2)
 {
 	return (item1.playcount == item2.playcount) ? _sortByAlpha(item1, item2) : item1.playcount > item2.playcount;
@@ -1768,8 +1763,6 @@ bool CCoverFlow::start(const char *id)
 	// Sort items
 	if (m_sorting == SORT_ALPHA)
 		sort(m_items.begin(), m_items.end(), CCoverFlow::_sortByAlpha);
-	else if (m_sorting == SORT_MAGIC)
-		sort(m_items.begin(), m_items.end(), CCoverFlow::_sortByMagic);
 	else if (m_sorting == SORT_PLAYCOUNT)
 		sort(m_items.begin(), m_items.end(), CCoverFlow::_sortByPlayCount);
 	else if (m_sorting == SORT_LASTPLAYED)
diff --git a/source/gui/coverflow.hpp b/source/gui/coverflow.hpp
index 92465b69..1f0d2277 100644
--- a/source/gui/coverflow.hpp
+++ b/source/gui/coverflow.hpp
@@ -28,7 +28,6 @@ enum Sorting
 	SORT_LASTPLAYED,
 	SORT_WIFIPLAYERS,
 	SORT_PLAYERS,
-	SORT_MAGIC,
 	SORT_MAX,
 	SORT_ESRB,
 	SORT_CONTROLLERS,
@@ -330,7 +329,6 @@ private:
 	void _stopSound(SmartGuiSound snd);
 	void _playSound(SmartGuiSound snd);
 
-	static bool _sortByMagic(CItem item1, CItem item2);
 	static bool _sortByPlayCount(CItem item1, CItem item2);
 	static bool _sortByLastPlayed(CItem item1, CItem item2);
 	static bool _sortByGameID(CItem item1, CItem item2);
diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp
index 6b46173e..0945abfe 100644
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@@ -372,7 +372,7 @@ int CMenu::main(void)
 			else if (BTN_PLUS_PRESSED && !m_locked)
 			{
 				u32 sort = 0;
-				sort = loopNum((m_cfg.getInt(domain, "sort", 0)) + 1, SORT_MAX);
+				sort = loopNum((m_cfg.getInt(domain, "sort", 0)) + 1, SORT_MAX - 1);
 				m_cf.setSorting((Sorting)sort);
 				m_cfg.setInt(domain, "sort", sort);
 				wstringEx curSort ;
@@ -390,8 +390,6 @@ int CMenu::main(void)
 					curSort = m_loc.getWString(m_curLanguage, "bywifiplayers", L"By Wifi Players");
 				else if (sort == SORT_PLAYERS)
 					curSort = m_loc.getWString(m_curLanguage, "byplayers", L"By Players");
-				else if (sort == SORT_MAGIC)
-					curSort = m_loc.getWString(m_curLanguage, "bypluginmagic", L"By Plugin Magic");
 				else if (sort == SORT_CONTROLLERS)
 					curSort = m_loc.getWString(m_curLanguage, "bycontrollers", L"By Controllers");