macosx: Cancel resume dialog as well in case current input ends

modules/gui/macosx/InputManager.m

@@ -29,6 +29,7 @@
 #import "MainWindow.h"
 #import "VLCPlaylist.h"
 #import "VLCPlaylistInfo.h"
+#import "ResumeDialogController.h"
 #import "TrackSynchronization.h"
 #import "VideoView.h"
 
@@ -199,6 +200,9 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
                                                             object:nil];
     }
 
+    // Cancel pending resume dialogs
+    [[[VLCMain sharedInstance] resumeDialog] cancel];
+
     input_thread_t *p_input_changed = NULL;
 
     // object is hold here and released then it is dead

modules/gui/macosx/ResumeDialogController.m

@@ -129,6 +129,9 @@
 
 - (void)cancel
 {
+    if (![self isWindowLoaded])
+        return;
+
     if (o_countdown_timer != nil) {
         [o_countdown_timer invalidate];
         o_countdown_timer = nil;

modules/gui/macosx/VLCPlaylist.m

@@ -867,8 +867,6 @@
 
 - (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread
 {
-   [[[VLCMain sharedInstance] resumeDialog] cancel];
-
     NSDictionary *recentlyPlayedFiles = [[NSUserDefaults standardUserDefaults] objectForKey:@"recentlyPlayedMedia"];
     if (!recentlyPlayedFiles)
         return;