Skip to content

fix(jvm): clear a previous error when opening new media; Linux clearError no longer blocks on Main #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
muthuraj57 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(jvm): clear a previous error when opening new media; Linux clearError no longer blocks on Main #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...c/jvmMain/kotlin/io/github/kdroidfilter/composemediaplayer/linux/LinuxVideoPlayerState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,9 +713,8 @@ class LinuxVideoPlayerState : VideoPlayerState {
}

override fun clearError() {
runBlocking {
withContext(Dispatchers.Main) { error = null }
}
// Snapshot state can be written from any thread; blocking on Main deadlocked when called from the UI thread.
error = null
}

override fun toggleFullscreen() {
Expand Down
4 changes: 3 additions & 1 deletion ...mMain/kotlin/io/github/kdroidfilter/composemediaplayer/windows/WindowsVideoPlayerState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ class WindowsVideoPlayerState : VideoPlayerState {
}
}

private var _error: VideoPlayerError? = null
private var _error: VideoPlayerError? by mutableStateOf(null)
override val error get() = _error

override fun clearError() {
Expand Down Expand Up @@ -498,6 +498,8 @@ class WindowsVideoPlayerState : VideoPlayerState {
mediaOperationMutex.withLock {
try {
isLoading = true
// An error from a previous source must not stick to this one.
clearError()

// Stop playback and release existing resources
val wasPlaying = _isPlaying
Expand Down