From ce1cdaacc3e9136f72c6573046afb2e3b79a84bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Tue, 11 Dec 2018 17:05:45 +0100
Subject: [PATCH] [apps/code] Fix console reloading that did not occur often
 enough

Scenario:
Write a script that prints "abc"
Open the console -> prints "abc"
Modify the script to print "ab"
Go back to the console -> "ab" not printed !
---
 apps/code/console_controller.cpp | 8 ++------
 apps/code/console_controller.h   | 1 -
 apps/code/menu_controller.cpp    | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/apps/code/console_controller.cpp b/apps/code/console_controller.cpp
index a12ecc324..b3cce8867 100644
--- a/apps/code/console_controller.cpp
+++ b/apps/code/console_controller.cpp
@@ -45,7 +45,7 @@ ConsoleController::ConsoleController(Responder * parentResponder, App * pythonDe
 }
 
 bool ConsoleController::loadPythonEnvironment() {
-  if(pythonEnvironmentIsLoaded()) {
+  if (m_pythonDelegate->isPythonUser(this)) {
     return true;
   }
   emptyOutputAccumulationBuffer();
@@ -60,16 +60,12 @@ bool ConsoleController::loadPythonEnvironment() {
 }
 
 void ConsoleController::unloadPythonEnvironment() {
-  if (pythonEnvironmentIsLoaded()) {
+  if (!m_pythonDelegate->isPythonUser(nullptr)) {
     m_consoleStore.startNewSession();
     m_pythonDelegate->deinitPython();
   }
 }
 
-bool ConsoleController::pythonEnvironmentIsLoaded() {
-  return m_pythonDelegate->isPythonUser(this);
-}
-
 void ConsoleController::autoImport() {
   for (int i = 0; i < m_scriptStore->numberOfScripts(); i++) {
     autoImportScript(m_scriptStore->scriptAtIndex(i));
diff --git a/apps/code/console_controller.h b/apps/code/console_controller.h
index 48a6750f7..287ea9012 100644
--- a/apps/code/console_controller.h
+++ b/apps/code/console_controller.h
@@ -26,7 +26,6 @@ public:
 
   bool loadPythonEnvironment();
   void unloadPythonEnvironment();
-  bool pythonEnvironmentIsLoaded();
 
   void setAutoImport(bool autoImport) { m_autoImportScripts = autoImport; }
   void autoImport();
diff --git a/apps/code/menu_controller.cpp b/apps/code/menu_controller.cpp
index 8b25cb07d..73c81f01d 100644
--- a/apps/code/menu_controller.cpp
+++ b/apps/code/menu_controller.cpp
@@ -147,7 +147,7 @@ void MenuController::openConsoleWithScript(Script script) {
   m_reloadConsoleWhenBecomingFirstResponder = true;
 }
 
-void MenuController::scriptContentEditionDidFinish(){
+void MenuController::scriptContentEditionDidFinish() {
   reloadConsole();
 }