diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
| commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
| tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /gtk2_ardour/editor_videotimeline.cc | |
| parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
| parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) | |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/editor_videotimeline.cc')
| -rw-r--r-- | gtk2_ardour/editor_videotimeline.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index 3f12c59179..4bf8b047cb 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -125,7 +125,8 @@ Editor::export_video () break; } } - ExportVideoDialog dialog (*this, _session); - dialog.run(); + ExportVideoDialog dialog (_session, get_selection().time); + Gtk::ResponseType r = (Gtk::ResponseType) dialog.run(); + (void) r; // keep gcc quiet dialog.hide(); } |