Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 3 insertions, 3 deletions

diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h
index 66bde21b..55859811 100644
--- a/src/displayapp/screens/Music.h
+++ b/src/displayapp/screens/Music.h
@@ -37,7 +37,7 @@ namespace Pinetime {
         
         bool Refresh() override;
         
-        bool OnButtonPushed() override;
+        
         
         void OnObjectEvent(lv_obj_t *obj, lv_event_t event);
       
@@ -76,12 +76,12 @@ namespace Pinetime {
         /** Last length */
         int lastLength;
         /** Last time an animation update or timer was incremented */
-        TickType_t lastIncrement;
+        TickType_t lastIncrement = 0;
         
         bool playing;
         
         /** Watchapp */
-        bool running = true;
+        
       };
     }
   }