From c91a809baa1e2a8addad0e533c63a835a17db70c Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 27 Dec 2019 23:27:20 +0100
Subject: [PATCH] infoviewer: kill segments from top to bottom, from left to
 right

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/68aa08e2e15cb9b004064d745a4f497c9d11de0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-12-27 (Fri, 27 Dec 2019)

Origin message was:
------------------
- infoviewer: kill segments from top to bottom, from left to right

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/gui/infoviewer.cpp | 54 +++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index fb0c1b525..df37e5e11 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -2203,15 +2203,23 @@ void CInfoViewer::killTitle()
 	{
 		is_visible = false;
 		infoViewerBB->is_visible = false;
-		if (infoViewerBB->getFooter())
-			infoViewerBB->getFooter()->kill();
-		if (infoViewerBB->getCABar())
-			infoViewerBB->getCABar()->kill();
-		if (rec)
-			rec->kill();
-		//printf("killTitle(%d, %d, %d, %d)\n", BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW-BoxStartX, bottom-BoxStartY);
-		//frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW, bottom);
-		if (!(zap_mode & IV_MODE_VIRTUAL_ZAP)){
+
+		if (g_settings.radiotext_enable && g_Radiotext)
+		{
+			g_Radiotext->S_RtOsd = g_Radiotext->haveRadiotext() ? 1 : 0;
+			killRadiotext();
+		}
+
+		//NI InfoIcons
+		if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
+			CInfoIcons::getInstance()->hideIcons();
+
+		//NI hide ecm.info
+		if (g_settings.show_ecm)
+			ecmInfoBox_hide();
+
+		if (!(zap_mode & IV_MODE_VIRTUAL_ZAP))
+		{
 			if (infobar_txt)
 				infobar_txt->kill();
 			numbox->kill();
@@ -2222,6 +2230,11 @@ void CInfoViewer::killTitle()
 		if (sigbox)
 			sigbox->kill();
 #endif
+		if (rec)
+			rec->kill();
+
+		if (timescale && (g_settings.infobar_progressbar == SNeutrinoSettings::INFOBAR_PROGRESSBAR_ARRANGEMENT_DEFAULT))
+			timescale->kill();
 
 		if (clock)
 		{
@@ -2232,8 +2245,6 @@ void CInfoViewer::killTitle()
 
 		header->kill();
 
-		body->kill();
-
 		if (txt_curr_start)
 			txt_curr_start->kill();
 		if (txt_curr_event)
@@ -2247,21 +2258,16 @@ void CInfoViewer::killTitle()
 		if (txt_next_in)
 			txt_next_in->kill();
 
-		if (timescale)
-			if (g_settings.infobar_progressbar == SNeutrinoSettings::INFOBAR_PROGRESSBAR_ARRANGEMENT_DEFAULT)
-				timescale->kill();
-		if (g_settings.radiotext_enable && g_Radiotext) {
-			g_Radiotext->S_RtOsd = g_Radiotext->haveRadiotext() ? 1 : 0;
-			killRadiotext();
-		}
+		body->kill();
 
-		//NI show ecm.info
-		if (g_settings.show_ecm)
-			ecmInfoBox_hide();
+		if (infoViewerBB->getCABar())
+			infoViewerBB->getCABar()->kill();
 
-		//NI InfoIcons
-		if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
-			CInfoIcons::getInstance()->hideIcons();
+		if (infoViewerBB->getFooter())
+			infoViewerBB->getFooter()->kill();
+
+		//printf("killTitle(%d, %d, %d, %d)\n", BoxStartX, BoxStartY, BoxEndX + OFFSET_SHADOW, BoxEndY);
+		//frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX + OFFSET_SHADOW, BoxEndY);
 	}
 	showButtonBar = false;
 	CInfoClock::getInstance()->enableInfoClock();