From c19a70bf4cf17ee0398940a594edbdaac1b243d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Fri, 19 May 2017 11:57:06 +0200
Subject: [PATCH] [apps/shared] Fix bug in interactive curve view controller

Change-Id: I9fb97e273d53e917b0d308e5a0e96d70e5429a85
---
 apps/shared/interactive_curve_view_controller.cpp | 10 +++-------
 apps/statistics/histogram_controller.cpp          |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/shared/interactive_curve_view_controller.cpp b/apps/shared/interactive_curve_view_controller.cpp
index 87106a6ac..7e6a2a016 100644
--- a/apps/shared/interactive_curve_view_controller.cpp
+++ b/apps/shared/interactive_curve_view_controller.cpp
@@ -147,24 +147,20 @@ void InteractiveCurveViewController::viewWillAppear() {
       initCursorParameters();
     }
   }
-  curveView()->selectMainView(true);
-  header()->setSelectedButton(-1);
-  reloadBannerView();
   curveView()->setOkView(&m_okView);
-  curveView()->reload();
 }
 
 void InteractiveCurveViewController::didEnterResponderChain(Responder * previousFirstResponder) {
   if (!curveView()->isMainViewSelected()) {
     curveView()->selectMainView(true);
     header()->setSelectedButton(-1);
-    reloadBannerView();
-    curveView()->reload();
   }
+  reloadBannerView();
+  curveView()->reload();
 }
 
 void InteractiveCurveViewController::willExitResponderChain(Responder * nextFirstResponder) {
-  if (nextFirstResponder == tabController()) {
+  if (nextFirstResponder == nullptr || nextFirstResponder == tabController()) {
     curveView()->selectMainView(false);
     header()->setSelectedButton(-1);
     curveView()->reload();
diff --git a/apps/statistics/histogram_controller.cpp b/apps/statistics/histogram_controller.cpp
index 5dd568099..b8dabddbf 100644
--- a/apps/statistics/histogram_controller.cpp
+++ b/apps/statistics/histogram_controller.cpp
@@ -132,13 +132,13 @@ void HistogramController::didEnterResponderChain(Responder * previousFirstRespon
   if (!m_view.isMainViewSelected()) {
     m_view.selectMainView(true);
     header()->setSelectedButton(-1);
-    reloadBannerView();
-    m_view.reload();
   }
+  reloadBannerView();
+  m_view.reload();
 }
 
 void HistogramController::willExitResponderChain(Responder * nextFirstResponder) {
-  if (nextFirstResponder == tabController()) {
+  if (nextFirstResponder == nullptr || nextFirstResponder == tabController()) {
     m_view.selectMainView(false);
     header()->setSelectedButton(-1);
     m_view.reload();