summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-03-31 20:33:26 +0200
committerRobin Gareus <robin@gareus.org>2013-03-31 20:34:02 +0200
commitb9d22839f12cbac94ddfd5f2ce438d375a3bcdc0 (patch)
tree4a9f04eb42c49cf897909efaabc9a5cadda12d5d /gtk2_ardour
parentab3040f789b543602950ad30a9b9206abfa285a3 (diff)
vtl: fix video-monitor [dialog] crash
caused by closing a session and then opening another video session -> the video-monitor session reference was outdated.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/video_timeline.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 9460632e6c..24d8f8ebcc 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -163,6 +163,10 @@ VideoTimeLine::close_session ()
video_filename = "";
video_duration = 0;
GuiUpdate("set-xjadeo-sensitive-off");
+ if (open_video_monitor_dialog) {
+ delete open_video_monitor_dialog;
+ }
+ open_video_monitor_dialog = 0;
}
/** load settings from session */
@@ -216,6 +220,11 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
video_file_info(propf->value(), local_file);
}
+ if (open_video_monitor_dialog) {
+ delete open_video_monitor_dialog;
+ }
+ open_video_monitor_dialog = 0;
+
node = _session->extra_xml (X_("Videomonitor"));
if (node) {
const XMLProperty* prop = node->property (X_("active"));