Skip to content

Commit

Permalink
Beta Version 4.1.1b0 (#175)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
cdgriffith authored Jan 13, 2021
1 parent e3533a3 commit 4728787
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/copy/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion fastflix/models/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -42,6 +42,8 @@
"copy_settings": CopySettings,
}

outdated_settings = ("copy",)


class Profile(BaseModel):
auto_crop: bool = False
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion fastflix/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
__version__ = "4.1.0"
__version__ = "4.1.1b0"
__author__ = "Chris Griffith"
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/advanced_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()]
Expand Down

0 comments on commit 4728787

Please sign in to comment.