Merge branch 'master' of https://github.com/profezzorn/ProffieOS

profezzorn · Sep 23, 2024 · 815fca1 · 815fca1
2 parents 2c60282 + 78f2c86
commit 815fca1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/props/detonator.h b/props/detonator.h
@@ -14,7 +14,7 @@ class Detonator : public PROP_INHERIT_PREFIX PropBase {
   bool powered_ = false;
   void SetPower(bool on) { powered_ = on; }
 #else
-  constexpr bool powered_ = true;
+  bool powered_ = true;
   void SetPower(bool on) {}
 #endif
 

diff --git a/props/saber_fett263_buttons.h b/props/saber_fett263_buttons.h
@@ -5788,7 +5788,7 @@ SaberFett263Buttons() : PropBase() {}
 #endif
 // Gesture Controls (not button specific)
       case EVENTID(BUTTON_NONE, EVENT_TWIST_RIGHT, MODE_ON):
-        if (wav_player && wav_player->isPlaying()) {
+        if (menu_ && wav_player && wav_player->isPlaying()) {
           current_menu_angle_ = fusor.angle2();
           return false;
         }
@@ -5809,7 +5809,7 @@ SaberFett263Buttons() : PropBase() {}
         return false;
 
       case EVENTID(BUTTON_NONE, EVENT_TWIST_LEFT, MODE_ON):
-        if (wav_player && wav_player->isPlaying()) {
+        if (menu_ && wav_player && wav_player->isPlaying()) {
           current_menu_angle_ = fusor.angle2();
           return false;
         }
@@ -5831,7 +5831,7 @@ SaberFett263Buttons() : PropBase() {}
         return false;
 
       case EVENTID(BUTTON_NONE, EVENT_TWIST_RIGHT, MODE_OFF):
-        if (wav_player && wav_player->isPlaying()) {
+        if (menu_ && wav_player && wav_player->isPlaying()) {
           current_menu_angle_ = fusor.angle2();
           return false;
         }
@@ -5842,7 +5842,7 @@ SaberFett263Buttons() : PropBase() {}
         return false;
 
       case EVENTID(BUTTON_NONE, EVENT_TWIST_LEFT, MODE_OFF):
-        if (wav_player && wav_player->isPlaying()) {
+        if (menu_ && wav_player && wav_player->isPlaying()) {
           current_menu_angle_ = fusor.angle2();
           return false;
         }
@@ -5921,7 +5921,7 @@ SaberFett263Buttons() : PropBase() {}
         return false;
 
       case EVENTID(BUTTON_NONE, EVENT_TWIST_RIGHT, MODE_OFF | BUTTON_POWER):
-        if (wav_player && wav_player->isPlaying()) {
+        if (menu_ && wav_player && wav_player->isPlaying()) {
           current_menu_angle_ = fusor.angle2();
           return false;
         }
@@ -5954,7 +5954,7 @@ SaberFett263Buttons() : PropBase() {}
         return false;
 
       case EVENTID(BUTTON_NONE, EVENT_TWIST_LEFT, MODE_OFF | BUTTON_POWER):
-        if (wav_player && wav_player->isPlaying()) {
+        if (menu_ && wav_player && wav_player->isPlaying()) {
           current_menu_angle_ = fusor.angle2();
           return false;
         }