1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00

static overloads of Track::SharedPointer when null check is needed...

... Some optimizing compilers don't let us get away with null check on this
in a nonstatic member function.
This commit is contained in:
Paul Licameli
2019-03-23 13:23:46 -04:00
parent 1af342ff64
commit bb634614e6
6 changed files with 15 additions and 8 deletions

View File

@@ -64,7 +64,7 @@ std::shared_ptr<Track> TrackPanelAx::GetFocus()
}
if (!focusedTrack) {
focusedTrack =
(*mTrackPanel->GetTracks()->Any().first)->SharedPointer();
Track::SharedPointer( *mTrackPanel->GetTracks()->Any().first );
// only call SetFocus if the focus has changed to avoid
// unnecessary focus events
if (focusedTrack)
@@ -99,7 +99,7 @@ std::shared_ptr<Track> TrackPanelAx::SetFocus( std::shared_ptr<Track> track )
#endif
if( !track )
track = (*mTrackPanel->GetTracks()->Any().begin())->SharedPointer();
track = Track::SharedPointer( *mTrackPanel->GetTracks()->Any().begin() );
mFocusedTrack = track;
mNumFocusedTrack = TrackNum(track);