summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.h
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2020-02-25 02:37:52 +0100
committerRobin Gareus <robin@gareus.org>2020-02-25 02:37:52 +0100
commit3a9a9f247f3a091609f25a4730633e7f146b911c (patch)
treed8c4be999f4e764a94949a4c188afb6d8252eeb8 /gtk2_ardour/editor.h
parent89e5954953bd50089e69cd133d86e96bb6ac849d (diff)
Clear import-status shared-ptr<> after use
Previously "Sequence files" set import_status.track and never reset() the shared pointer. This resulted in various follow up issues.
Diffstat (limited to 'gtk2_ardour/editor.h')
-rw-r--r--gtk2_ardour/editor.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index de202c8c4f..7d8df5457a 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1425,12 +1425,17 @@ private:
/* import specific info */
struct EditorImportStatus : public ARDOUR::ImportStatus {
- Editing::ImportMode mode;
- samplepos_t pos;
- int target_tracks;
- int target_regions;
- boost::shared_ptr<ARDOUR::Track> track;
- bool replace;
+ void clear () {
+ ARDOUR::ImportStatus::clear ();
+ track.reset ();
+ }
+
+ Editing::ImportMode mode;
+ samplepos_t pos;
+ int target_tracks;
+ int target_regions;
+ boost::shared_ptr<ARDOUR::Track> track;
+ bool replace;
};
EditorImportStatus import_status;