diff --git a/src/lib/tunes/tunes.cpp b/src/lib/tunes/tunes.cpp index d418a2f5a9..f998436d7f 100644 --- a/src/lib/tunes/tunes.cpp +++ b/src/lib/tunes/tunes.cpp @@ -74,7 +74,7 @@ void Tunes::config_tone(bool repeat_flag) _next = nullptr; } else { - _tune = _start_tune; + _tune = _tune_start_ptr; _next = _tune; } @@ -120,7 +120,7 @@ int Tunes::set_control(const tune_control_s &tune_control) // TODO: come up with a better strategy if (_tune == nullptr || reset_playing_tune || tune_control.tune_override) { _tune = _default_tunes[tune_control.tune_id]; - _start_tune = _default_tunes[tune_control.tune_id]; + _tune_start_ptr = _default_tunes[tune_control.tune_id]; _next = _tune; } @@ -140,7 +140,7 @@ void Tunes::set_string(const char *string) // set tune string the first time if (_tune == nullptr) { _tune = string; - _start_tune = string; + _tune_start_ptr = string; _next = _tune; } } diff --git a/src/lib/tunes/tunes.h b/src/lib/tunes/tunes.h index 87591ce480..2a96ba6a3f 100644 --- a/src/lib/tunes/tunes.h +++ b/src/lib/tunes/tunes.h @@ -101,7 +101,7 @@ private: const char *_tune = nullptr; ///< current tune string const char *_next = nullptr; ///< next note in the string - const char *_start_tune = nullptr; ///< pointer to repeat tune + const char *_tune_start_ptr = nullptr; ///< pointer to repeat tune unsigned _tempo; unsigned _note_length;