Merge pull request #612 from atopuzov/resume_playback

Check whether to resume playback
radiant-player · Sep 26, 2016 · 9b1f202 · 9b1f202
2 parents 011dca7 + 6482805
commit 9b1f202
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/radiant-player-mac/AppDelegate.h b/radiant-player-mac/AppDelegate.h
@@ -83,6 +83,7 @@
 @property (assign) NSTimeInterval currentDuration;
 @property (assign) NSTimeInterval currentTimestamp;
 @property (assign) NSInteger currentPlaybackMode;
+@property (assign) NSInteger previousPlaybackMode;
 
 - (void) initializeStatusBar;
 - (NSMutableDictionary *) styles;

diff --git a/radiant-player-mac/AppDelegate.m b/radiant-player-mac/AppDelegate.m
@@ -47,6 +47,7 @@ @implementation AppDelegate
 @synthesize currentDuration;
 @synthesize currentTimestamp;
 @synthesize currentPlaybackMode;
+@synthesize previousPlaybackMode;
 
 /**
  * Closing the application, hides the player window but keeps music playing in the background.
@@ -66,6 +67,7 @@ - (BOOL)windowShouldClose:(NSNotification *)notification
 
 - (void)receiveSleepNotification:(NSNotification*)notification
 {
+    previousPlaybackMode = currentPlaybackMode;
     if (currentPlaybackMode == MUSIC_PLAYING)
         [self playPause:self];
 }
@@ -76,6 +78,7 @@ - (void)RadiantScreenLocked {
 
     if ([defaults boolForKey:@"toggleMusicOnScreenLock"])
     {
+        previousPlaybackMode = currentPlaybackMode;
         if (currentPlaybackMode == MUSIC_PLAYING) {
             [self playPause:self];
         }
@@ -85,7 +88,7 @@ - (void)RadiantScreenLocked {
 - (void)RadiantScreenUnlocked {
     if ([defaults boolForKey:@"toggleMusicOnScreenLock"])
     {
-        if (currentPlaybackMode == MUSIC_PAUSED) {
+        if (previousPlaybackMode == MUSIC_PLAYING && currentPlaybackMode == MUSIC_PAUSED) {
             [self playPause:self];
         }
     }