From 4728787494fdd9ad98a026940f27d191e6c81762 Mon Sep 17 00:00:00 2001
From: Chris Griffith <chris@cdgriffith.com>
Date: Wed, 13 Jan 2021 10:23:28 -0600
Subject: [PATCH] Beta Version 4.1.1b0 (#175)

* Fixing #156 Copy was broken due to copy settings being renamed due to library update (thanks to leonardyan)
* Fixing #172 FastFlix could not set profile setting copy (thanks to Etz)
* Fixing calling delete on a profile without a source video could crash FastFlix
---
 CHANGES                                   | 6 ++++++
 fastflix/encoders/copy/settings_panel.py  | 2 +-
 fastflix/models/config.py                 | 6 +++++-
 fastflix/version.py                       | 2 +-
 fastflix/widgets/panels/advanced_panel.py | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9eb65963..1dfcc7e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 4.1.1
+
+* Fixing #156 Copy was broken due to copy settings being renamed due to library update (thanks to leonardyan)
+* Fixing #172 FastFlix could not set profile setting copy (thanks to Etz)
+* Fixing calling delete on a profile without a source video could crash FastFlix
+
 ## Version 4.1.0
 
 * Adding #118 #126 advanced panel with FFmpeg filters (thanks to Marco Ravich and remlap)
diff --git a/fastflix/encoders/copy/settings_panel.py b/fastflix/encoders/copy/settings_panel.py
index e08002fe..5b37b2fb 100644
--- a/fastflix/encoders/copy/settings_panel.py
+++ b/fastflix/encoders/copy/settings_panel.py
@@ -12,7 +12,7 @@
 
 
 class Copy(SettingPanel):
-    profile_name = "copy"
+    profile_name = "copy_settings"
 
     def __init__(self, parent, main, app: FastFlixApp):
         super().__init__(parent, main, app)
diff --git a/fastflix/models/config.py b/fastflix/models/config.py
index 950a9ffd..88e4ca3f 100644
--- a/fastflix/models/config.py
+++ b/fastflix/models/config.py
@@ -3,7 +3,7 @@
 import shutil
 from distutils.version import StrictVersion
 from pathlib import Path
-from typing import Dict, List, Optional, Union
+from typing import Dict, List, Optional
 
 from appdirs import user_data_dir
 from box import Box, BoxError
@@ -42,6 +42,8 @@
     "copy_settings": CopySettings,
 }
 
+outdated_settings = ("copy",)
+
 
 class Profile(BaseModel):
     auto_crop: bool = False
@@ -193,6 +195,8 @@ def load(self):
                         continue
                     profile = Profile()
                     for setting_name, setting in v.items():
+                        if setting_name in outdated_settings:
+                            continue
                         if setting_name in setting_types.keys() and setting is not None:
                             try:
                                 setattr(profile, setting_name, setting_types[setting_name](**setting))
diff --git a/fastflix/version.py b/fastflix/version.py
index 197c9448..6722f42c 100644
--- a/fastflix/version.py
+++ b/fastflix/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-__version__ = "4.1.0"
+__version__ = "4.1.1b0"
 __author__ = "Chris Griffith"
diff --git a/fastflix/widgets/panels/advanced_panel.py b/fastflix/widgets/panels/advanced_panel.py
index 1629f4c7..57c1559e 100644
--- a/fastflix/widgets/panels/advanced_panel.py
+++ b/fastflix/widgets/panels/advanced_panel.py
@@ -370,7 +370,7 @@ def vbv_check_changed(self):
     # (800 + 140) - 1080 == -140
 
     def update_settings(self):
-        if self.updating:
+        if self.updating or not self.app.fastflix.current_video:
             return False
         self.updating = True
         self.app.fastflix.current_video.video_settings.video_speed = video_speeds[self.video_speed_widget.currentText()]