Fix #1807 (VLC does not start) #1850
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
https://github.com/webtorrent/webtorrent-desktop/blob/eb5a291c8b9cbfae96f306e153387e720a7baa72/src/renderer/lib/migrations.js#L219 cause external player to be a empty string instead of a null one
shaejaz
reviewed
Jul 29, 2020
src/main/external-player.js
Outdated
| @@ -17,12 +17,12 @@ let proc = null | |||
| function checkInstall (playerPath, cb) { | |||
| // check for VLC if external player has not been specified by the user | |||
| // otherwise assume the player is installed | |||
| if (playerPath == null) return vlcCommand(cb) | |||
| if (playerPath.length === 0) return vlcCommand(cb) | |||
There was a problem hiding this comment.
Won't this throw a TypeError when playerPath is null tho?
There was a problem hiding this comment.
That's why I included a reference to the migration file replacing null by an empty string.
However if it still possible to receive null I will modify my PR accordingly.
mathiasvr
reviewed
Jul 30, 2020
src/main/external-player.js
Outdated
| @@ -17,12 +17,12 @@ let proc = null | |||
| function checkInstall (playerPath, cb) { | |||
| // check for VLC if external player has not been specified by the user | |||
| // otherwise assume the player is installed | |||
| if (playerPath == null) return vlcCommand(cb) | |||
| if (playerPath.length === 0) return vlcCommand(cb) | |||
There was a problem hiding this comment.
Can we simplify like this to cover both null and empty string just in case:
Suggested change
| if (playerPath.length === 0) return vlcCommand(cb) | |
| if (!playerPath) return vlcCommand(cb) |
src/main/external-player.js
Outdated
| process.nextTick(() => cb(null)) | ||
| } | ||
|
|
||
| function spawn (playerPath, url, title) { | ||
| if (playerPath != null) return spawnExternal(playerPath, [url]) | ||
| if (playerPath.length !== 0) return spawnExternal(playerPath, [url]) |
There was a problem hiding this comment.
Likewise here:
Suggested change
| if (playerPath.length !== 0) return spawnExternal(playerPath, [url]) | |
| if (playerPath) return spawnExternal(playerPath, [url]) |
|
I considered that null should be also accepted without throwing based on @mathiasvr review and change the PR content accordingly. |
hicom150
approved these changes
Jul 30, 2020
mathiasvr
approved these changes
Jul 30, 2020
alxhotel
approved these changes
Jul 31, 2020
|
Thanks for the quick fix, folks! I'm going to put out a new WebTorrent Desktop release to get this into the hands of users. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
webtorrent-desktop/src/renderer/lib/migrations.js
Line 219 in eb5a291
What is the purpose of this pull request? (put an "X" next to item)
[ ] Documentation update
[X] Bug fix
[ ] New feature
[ ] Other, please explain:
What changes did you make? (Give an overview)
VLC does not start
Which issue (if any) does this pull request address?
Fix #1807
Is there anything you'd like reviewers to focus on?