colin/sublime-music
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue where play progress wasn't being restored correctly

Browse Source
This commit is contained in:
Sumner Evans
2020-01-01 00:19:04 -07:00
parent 9cdaa9ecea
commit 76afabbe85
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sublime/app.py
View File

@@ -167,18 +167,21 @@ class SublimeMusicApp(Gtk.Application):
if self.loading_state: if self.loading_state:
return return
if value is None:
self.last_play_queue_update = 0
return
self.state.song_progress = value self.state.song_progress = value
GLib.idle_add( GLib.idle_add(
self.window.player_controls.update_scrubber, self.window.player_controls.update_scrubber,
self.state.song_progress, self.state.song_progress,
self.state.current_song.duration, self.state.current_song.duration,
) )
if not value:
self.last_play_queue_update = 0 if self.last_play_queue_update + 15 <= value:
elif self.last_play_queue_update + 15 <= value:
self.save_play_queue() self.save_play_queue()
if value and value > 5 and self.should_scrobble_song: if value > 5 and self.should_scrobble_song:
CacheManager.scrobble(self.state.current_song.id) CacheManager.scrobble(self.state.current_song.id)
self.should_scrobble_song = False self.should_scrobble_song = False
@@ -767,8 +770,11 @@ class SublimeMusicApp(Gtk.Application):
if prompt_confirm: if prompt_confirm:
# If there's not a significant enough difference, don't prompt. # If there's not a significant enough difference, don't prompt.
progress_diff = abs( progress_diff = 15
self.state.song_progress - new_song_progress) if self.state.song_progress:
progress_diff = abs(
self.state.song_progress - new_song_progress)
if (self.state.play_queue == new_play_queue if (self.state.play_queue == new_play_queue
and self.state.current_song and self.state.current_song
and self.state.current_song.id == new_current_song_id and self.state.current_song.id == new_current_song_id