From a9935a6bb40a8833f0a231b0403e63eaa2358592 Mon Sep 17 00:00:00 2001 From: Simran Spiller Date: Mon, 16 Nov 2020 15:07:16 +0100 Subject: [PATCH 1/2] CI: Enable automated builds for pull requests against our master branch. This includes branches from forked repos. Packages and debug symbols are not uploaded to the website, but artifacts can be accessed by any authenticated GitHub user until they expire (current 90 days). [skip ci] --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e51c348c..4ae08e614 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,15 @@ on: - 'docker/**' - 'CONTRIBUTING.md' - 'README.md' + pull_request: + branches: + - master + paths-ignore: + - '.github/ISSUE_TEMPLATE/**' + - '.github/FUNDING.yml' + - 'docker/**' + - 'CONTRIBUTING.md' + - 'README.md' env: DOWNLOAD_TOOL: curl -fLOSs --retry 2 --retry-delay 60 @@ -257,6 +266,7 @@ jobs: shell: bash env: GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }} + if: github.event_name == 'push' run: | curl -fLSs --retry 2 --retry-delay 60 \ https://github.com/google/breakpad/blob/master/src/tools/windows/binaries/dump_syms.exe?raw=true > dump_syms.exe From 0e0d557b1bb9fcfbe0a1d8f8e4cf1f6ba2bb6637 Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Mon, 16 Nov 2020 20:26:45 +0000 Subject: [PATCH 2/2] 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(),