From 0e0d557b1bb9fcfbe0a1d8f8e4cf1f6ba2bb6637 Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Mon, 16 Nov 2020 20:26:45 +0000 Subject: [PATCH] videostreamproperties: Fix alpha checkbox Check video_premultiply_alpha is not null before trying to access its members in VideoStreamProperties::Accept. Also initialise video_premultiply_alpha as nullptr in the constructor. app/dialog/footageproperties/streamproperties/videostreamproperties.cpp --- .../streamproperties/videostreamproperties.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp index f6ebfcfcc..49f5c367f 100644 --- a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp +++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp @@ -35,7 +35,8 @@ OLIVE_NAMESPACE_ENTER VideoStreamProperties::VideoStreamProperties(VideoStreamPtr stream) : - stream_(stream) + stream_(stream), + video_premultiply_alpha_(nullptr) { QGridLayout* video_layout = new QGridLayout(this); video_layout->setMargin(0); @@ -131,13 +132,13 @@ void VideoStreamProperties::Accept(QUndoCommand *parent) set_colorspace = video_color_space_->currentText(); } - if (video_premultiply_alpha_->isChecked() != stream_->premultiplied_alpha() + if ((video_premultiply_alpha_ && video_premultiply_alpha_->isChecked() != stream_->premultiplied_alpha()) || set_colorspace != stream_->colorspace(false) || static_cast(video_interlace_combo_->currentIndex()) != stream_->interlacing() || pixel_aspect_combo_->GetPixelAspectRatio() != stream_->pixel_aspect_ratio()) { new VideoStreamChangeCommand(stream_, - video_premultiply_alpha_->isChecked(), + video_premultiply_alpha_ ? video_premultiply_alpha_->isChecked() : stream_->premultiplied_alpha(), set_colorspace, static_cast(video_interlace_combo_->currentIndex()), pixel_aspect_combo_->GetPixelAspectRatio(),