Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-14 17:14:07 +01:00
Code Issues Releases Wiki Activity

build fix

Browse Source
This commit is contained in:
Paul Licameli
2017-07-09 13:37:20 -04:00
parent fb75f1d00b
commit 0fa0d480e4
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tracks/labeltrack/ui/LabelTextHandle.cpp
View File

@@ -66,7 +66,7 @@ UIHandle::Result LabelTextHandle::Click
auto &selectionState = pProject->GetSelectionState(); auto &selectionState = pProject->GetSelectionState();
TrackList *const tracks = pProject->GetTracks(); TrackList *const tracks = pProject->GetTracks();
mChanger = mChanger =
std::make_unique< SelectionStateChanger >( selectionState, *tracks ); std::make_shared< SelectionStateChanger >( selectionState, *tracks );
const wxMouseEvent &event = evt.event; const wxMouseEvent &event = evt.event;
ViewInfo &viewInfo = pProject->GetViewInfo(); ViewInfo &viewInfo = pProject->GetViewInfo();
@@ -167,7 +167,7 @@ UIHandle::Result LabelTextHandle::Release
if (mChanger) { if (mChanger) {
mChanger->Commit(); mChanger->Commit();
mChanger.release(); mChanger.reset();
} }
const wxMouseEvent &event = evt.event; const wxMouseEvent &event = evt.event;
@@ -187,7 +187,6 @@ UIHandle::Result LabelTextHandle::Cancel( AudacityProject *pProject )
// Restore the selection states of tracks // Restore the selection states of tracks
// Note that we are also relying on LabelDefaultClickHandle::Cancel // Note that we are also relying on LabelDefaultClickHandle::Cancel
// to restore the selection state of the labels in the tracks. // to restore the selection state of the labels in the tracks.
mChanger.release();
ViewInfo &viewInfo = pProject->GetViewInfo(); ViewInfo &viewInfo = pProject->GetViewInfo();
viewInfo.selectedRegion = mSelectedRegion; viewInfo.selectedRegion = mSelectedRegion;
auto result = LabelDefaultClickHandle::Cancel( pProject ); auto result = LabelDefaultClickHandle::Cancel( pProject );

2
src/tracks/labeltrack/ui/LabelTextHandle.h
View File

@@ -60,7 +60,7 @@ private:
int mLabelTrackStartXPos { -1 }; int mLabelTrackStartXPos { -1 };
int mLabelTrackStartYPos { -1 }; int mLabelTrackStartYPos { -1 };
SelectedRegion mSelectedRegion{}; SelectedRegion mSelectedRegion{};
std::unique_ptr<SelectionStateChanger> mChanger; std::shared_ptr<SelectionStateChanger> mChanger;
}; };
#endif #endif