From 2b2a81df00b78c2b8497e3cf5dc9b56268cb61ef Mon Sep 17 00:00:00 2001
From: Brenno <brenno.caldato@gmail.com>
Date: Mon, 30 Nov 2020 11:52:30 -0300
Subject: [PATCH 1/2] Disabling region selection after closing window
 Initialize Effect

---
 src/windows/region.py       | 2 ++
 src/windows/video_widget.py | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/windows/region.py b/src/windows/region.py
index d6ad2feaad..5cb3868372 100644
--- a/src/windows/region.py
+++ b/src/windows/region.py
@@ -245,6 +245,7 @@ def accept(self):
         """ Ok button clicked """
 
         self.shutdownPlayer()
+        get_app().window.SelectRegionSignal.emit("")
         super(SelectRegion, self).accept()
 
     def shutdownPlayer(self):
@@ -270,6 +271,7 @@ def reject(self):
 
         # Cancel dialog
         self.shutdownPlayer()
+        get_app().window.SelectRegionSignal.emit("")
         super(SelectRegion, self).reject()
 
 
diff --git a/src/windows/video_widget.py b/src/windows/video_widget.py
index 98de8b543e..1a5fde609c 100644
--- a/src/windows/video_widget.py
+++ b/src/windows/video_widget.py
@@ -811,7 +811,12 @@ def transformTriggered(self, clip_id):
 
     def regionTriggered(self, clip_id):
         """Handle the 'select region' signal when it's emitted"""
-        self.region_enabled = True
+        if self and not clip_id:
+            # Clear transform
+            self.region_enabled = False
+        else:
+            self.region_enabled = True
+        
         get_app().window.refreshFrameSignal.emit()
 
     def resizeEvent(self, event):

From a7fbf3156bac9cf1a75d4589fb8ba433ef2d57d0 Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Wed, 30 Dec 2020 16:10:22 -0600
Subject: [PATCH 2/2] Fixing mac builder CI path to Python3

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd9cbe6195..656dfe4439 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,8 +63,8 @@ mac-builder:
     - export DYLD_LIBRARY_PATH=$CI_PROJECT_DIR/build/install-x64/lib:DYLD_LIBRARY_PATH
     - echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "build/install-x64/share/$CI_PROJECT_NAME"
     - git log $(git describe --tags --abbrev=0 @^)..@ --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "build/install-x64/share/$CI_PROJECT_NAME.log"
-    - /Library/Frameworks/Python.Framework/Versions/3.6/bin/python3.6 -u freeze.py bdist_mac --iconfile=installer/openshot.icns --custom-info-plist=installer/Info.plist --bundle-name="OpenShot Video Editor"
-    - /Library/Frameworks/Python.Framework/Versions/3.6/bin/python3.6 -u installer/build-server.py "$SLACK_TOKEN" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME"
+    - python3 -u freeze.py bdist_mac --iconfile=installer/openshot.icns --custom-info-plist=installer/Info.plist --bundle-name="OpenShot Video Editor"
+    - python3 -u installer/build-server.py "$SLACK_TOKEN" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME"
   when: always
   except:
   - tags