Merge branch 'develop' into motionservice_fix_typo_in_include

1 files changed, 5 insertions, 3 deletions

diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index 32a14d2f..4b301ce1 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -17,9 +17,9 @@
 */
 #pragma once
 
-#include "Screen.h"
+#include "displayapp/screens/Screen.h"
 #include "systemtask/SystemTask.h"
-#include "../LittleVgl.h"
+#include "displayapp/LittleVgl.h"
 #include "components/alarm/AlarmController.h"
 
 namespace Pinetime {
@@ -40,7 +40,9 @@ namespace Pinetime {
         Controllers::AlarmController& alarmController;
 
         lv_obj_t *time, *btnEnable, *txtEnable, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp, *txtMinDown,
-          *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnMessage, *txtMessage, *btnInfo, *txtInfo;
+          *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo;
+        lv_obj_t* txtMessage = nullptr;
+        lv_obj_t* btnMessage = nullptr;
 
         enum class EnableButtonState { On, Off, Alerting };
         void SetEnableButtonState();