github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent librespot from becoming a zombie

Browse source 
Prevent hang when discovery is disabled and there are no credentials or when bad credentials are given.
This commit is contained in:
JasonLG1979 2021-10-28 09:10:10 -05:00
parent 5049cd76e0
commit 24e4d2b636
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
- [cache] Add `disable-credential-cache` flag (breaking). - [cache] Add `disable-credential-cache` flag (breaking).
### Fixed
- [main] Prevent hang when discovery is disabled and there are no credentials or when bad credentials are given.
## [0.3.1] - 2021-10-24 ## [0.3.1] - 2021-10-24
### Changed ### Changed

8
src/main.rs
View file

@ -647,6 +647,11 @@ fn get_setup(args: &[String]) -> Setup {
) )
}; };
if credentials.is_none() && matches.opt_present(DISABLE_DISCOVERY) {
error!("Credentials are required if discovery is disabled.");
exit(1);
}
let session_config = { let session_config = {
let device_id = device_id(&name); let device_id = device_id(&name);
@ -923,7 +928,8 @@ async fn main() {
player_event_channel = Some(event_channel); player_event_channel = Some(event_channel);
}, },
Err(e) => { Err(e) => {
warn!("Connection failed: {}", e); error!("Connection failed: {}", e);
exit(1);
} }
}, },
_ = async { spirc_task.as_mut().unwrap().await }, if spirc_task.is_some() => { _ = async { spirc_task.as_mut().unwrap().await }, if spirc_task.is_some() => {