From d7962617e47c221b6274af53b9488e5280c8d2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sat, 12 Jun 2021 14:21:29 +0200
Subject: [PATCH] Clock : initialize the actual clockface in initialization
 list instead of in the core of the ctro().

---
 src/displayapp/screens/Clock.cpp | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 9962a9f4..05e47a39 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -32,25 +32,18 @@ Clock::Clock(DisplayApp* app,
     notificatioManager {notificatioManager},
     settingsController {settingsController},
     heartRateController {heartRateController},
-    motionController {motionController} {
-  
-  switch (settingsController.GetClockFace()) {
-    case 0:
-      screen = WatchFaceDigitalScreen();
-      break;
-    case 1:
-      screen = WatchFaceAnalogScreen();
-      break;
-    /*
-    // Examples for more watch faces
-    case 2:
-      screen = WatchFaceMinimalScreen();
-      break;
-    case 3:
-      screen = WatchFaceCustomScreen();
-      break;
-    */
-  }
+    motionController {motionController},
+    screen {[this, &settingsController]() {
+      switch (settingsController.GetClockFace()) {
+        case 0:
+          return WatchFaceDigitalScreen();
+          break;
+        case 1:
+          return WatchFaceAnalogScreen();
+          break;
+      }
+      return WatchFaceDigitalScreen();
+    }()} {
   settingsController.SetAppMenu(0);
 }