Skip to content

Commit

Permalink
Add config.json check_ffmpeg support
Browse files Browse the repository at this point in the history
  • Loading branch information
Corne2Plum3 committed Feb 12, 2022
1 parent d65734e commit cc668a6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

app_name = config_data["app_name"]
app_version = config_data["app_version"] # version of the application
check_ffmpeg = config_data["check_ffmpeg"] # check if ffmpeg is installed when the program is started
colors = config_data["colors"] # dict with some colors used in the app
delete_files_when_cancel = config_data["delete_files_when_cancel"] # if the cancel button is pressed, delete generated files? (0 or 1)
difficulties = config_data["init"]["difficulties"] # the dict of lists of 2 elements {"diff_name": [map_mode (str), fnf_json_path]}
Expand Down Expand Up @@ -1192,7 +1193,7 @@ def setFilePath(string_var):
# WHERE THE PROGRAM STARTS

try:
if not(detectFFMPEG()): # ffmpeg not detected
if check_ffmpeg and not(detectFFMPEG()): # ffmpeg not detected
ffmpeg_window = No_FFMPEG_window()
ffmpeg_window.openWindow()

Expand Down

0 comments on commit cc668a6

Please sign in to comment.