From e6d94bda27df4bf5ff6ea38978c23c9a3cc817a9 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sun, 3 Mar 2019 22:20:23 +0100
Subject: [PATCH] - channellist: fix formatation of new code from "add
 primetime feature to channellist"

 Conflicts:
	src/gui/channellist.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 src/gui/channellist.cpp | 61 ++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 782f65e4e..c8abc06bd 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -177,14 +177,14 @@ void CChannelList::updateEvents(unsigned int from, unsigned int to)
 	CChannelEventList events;
 	if (displayNext) {
 		time_t atime = time(NULL);
-        if (g_settings.channellist_primetime && primetime)
-        {
-            struct tm * timeinfo;
-            timeinfo = localtime (&atime);
-            timeinfo->tm_hour = 20;
-            timeinfo->tm_min = 0;
-            atime = mktime(timeinfo);
-        }
+		if (g_settings.channellist_primetime && primetime)
+		{
+			struct tm * timeinfo;
+			timeinfo = localtime (&atime);
+			timeinfo->tm_hour = 20;
+			timeinfo->tm_min = 0;
+			atime = mktime(timeinfo);
+		}
 		unsigned int count;
 		for (count = from; count < to; count++) {
 			CEitManager::getInstance()->getEventsServiceKey((*chanlist)[count]->getEpgID(), events);
@@ -873,10 +873,12 @@ int CChannelList::show()
 #if 0
 				if (g_settings.channellist_additional)
 					displayList = !displayList;
-				else {
+				else
+				{
 					if (primetime && displayNext)
 						primetime = 0;
-					else {
+					else
+					{
 						primetime = 0;
 						displayNext = !displayNext;
 					}
@@ -901,16 +903,18 @@ int CChannelList::show()
 					oldselected = selected;
 					paint();
 				} else {
-                        if (g_settings.channellist_primetime) {
-                            if (displayNext && !primetime)
-                                primetime = 1;
-                            else {
-                                primetime = 1;
-                                displayNext = !displayNext;
+					if (g_settings.channellist_primetime)
+					{
+						if (displayNext && !primetime)
+							primetime = 1;
+						else
+						{
+							primetime = 1;
+							displayNext = !displayNext;
+						}
+						paint();
+					}
 				}
-                            paint();
-                        }
-                    }
 			}
 		}
 		else if (!empty && edit_state && move_state != beMoving && msg == CRCInput::RC_stop )
@@ -1855,14 +1859,15 @@ void CChannelList::paintButtonBar(bool is_current)
 				}
 			} else
 			{
-                if (g_settings.channellist_primetime)
-                {
-                    if (displayNext && primetime)
-                        Button[bcnt].locale = LOCALE_INFOVIEWER_NOW;
-                    else
-                        Button[bcnt].locale = LOCALE_CHANNELLIST_PRIMETIME;
-                } else
-                    continue;
+				if (g_settings.channellist_primetime)
+				{
+					if (displayNext && primetime)
+						Button[bcnt].locale = LOCALE_INFOVIEWER_NOW;
+					else
+						Button[bcnt].locale = LOCALE_CHANNELLIST_PRIMETIME;
+				}
+				else
+					continue;
 			}
 		}
 		if (i == 3) {
@@ -2598,7 +2603,7 @@ void CChannelList::showdescription(int index)
 	CZapitChannel* chan = (*chanlist)[index];
 	CChannelEvent *p_event = &chan->currentEvent;
 	if (displayNext && primetime)
-        p_event = &chan->nextEvent;
+		p_event = &chan->nextEvent;
 	epgData.info1.clear();
 	epgData.info2.clear();
 	epgText.clear();