Merge branch 'Syncplay:master' into master

This commit is contained in:
Grace Lovelace 2022-04-06 21:34:17 -07:00 committed by GitHub
commit dea21adc32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View File

@ -24,8 +24,9 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.
**Version and platform:**
- OS: [e.g. Windows 10 or macOS 10.15]
- OS: [e.g. Windows 10 64-bit or macOS 10.15]
- Syncplay version and build type: [e.g. Syncplay 1.6.9 portable]
- Media player and version: [e.g. VLC 3.0.16 32-bit]
**Additional context**

View File

@ -82,7 +82,7 @@ jobs:
- name: Install Python dependencies
run: |
pip3 install -U setuptools wheel pip
pip3 install -U setuptools==60.* wheel pip
pip3 install twisted[tls] appnope requests certifi
pip3 install shiboken2==5.15.2 pyside2==5.15.2
pip3 install altgraph modulegraph macholib

View File

@ -383,7 +383,7 @@ def getListAsMultilineString(pathArray):
def convertMultilineStringToList(multilineString):
return str.split(multilineString, "\n") if multilineString else ""
return str.split(multilineString, "\n") if multilineString else []
def playlistIsValid(files):