diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2008-05-06 22:54:06 +0000 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2008-05-06 22:54:06 +0000 |
| commit | a42913736ab4bd1743d7c29feaaa431094ccb4c9 (patch) | |
| tree | 1ca8e4b859b0f6f48cf682c908a1029ce89800b2 /gtk2_ardour | |
| parent | c415c44b9c88d12123b0d493c1f71317efbb34e0 (diff) | |
* fixed crash bug in MidiModel::const_iterator::operator=: copied iterator from other which becomes invalid because
the container the iterator points into is destroyed
* fixed conditional jump from uninitialised value in CanvasNote
git-svn-id: svn://localhost/ardour2/branches/3.0@3326 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/canvas-note.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/canvas-note.h b/gtk2_ardour/canvas-note.h index de2d0ecb9d..84791c89ca 100644 --- a/gtk2_ardour/canvas-note.h +++ b/gtk2_ardour/canvas-note.h @@ -31,15 +31,6 @@ namespace Canvas { class CanvasNote : public SimpleRect, public CanvasNoteEvent { public: - CanvasNote( - MidiRegionView& region, - Group& group, - const boost::shared_ptr<ARDOUR::Note> note = boost::shared_ptr<ARDOUR::Note>()) - - : SimpleRect(group), CanvasNoteEvent(region, this, note) - { - } - double x1() { return property_x1(); } double y1() { return property_y1(); } double x2() { return property_x2(); } @@ -61,6 +52,15 @@ public: AbsoluteResize }; + CanvasNote( + MidiRegionView& region, + Group& group, + const boost::shared_ptr<ARDOUR::Note> note = boost::shared_ptr<ARDOUR::Note>()) + + : SimpleRect(group), CanvasNoteEvent(region, this, note), _note_state(None) + { + } + protected: NoteState _note_state; |