2 files changed, 15 insertions, 12 deletions
diff --git a/src/video_out/macosx/video_window.h b/src/video_out/macosx/video_window.h
index e0f199305..5f2cad55e 100644
--- a/src/video_out/macosx/video_window.h
+++ b/src/video_out/macosx/video_window.h
@@ -41,7 +41,7 @@ typedef enum {
     NSOpenGLContext               *currentContext;
     NSLock                        *mutex;
     BOOL                           keepsVideoAspectRatio;
-    BOOL                           resizeViewToVideoSizeOnLoad;
+    BOOL                           resizeViewOnVideoSizeChange;
 }
 
 - (void) displayTexture;
@@ -62,8 +62,8 @@ typedef enum {
 - (NSSize) videoSize;
 - (void) setKeepsVideoAspectRatio:(BOOL)flag;
 - (BOOL) keepsVideoAspectRatio;
-- (void) setResizeViewToVideoSizeOnLoad:(BOOL)flag;
-- (BOOL) resizeViewToVideoSizeOnLoad;
+- (void) setResizeViewOnVideoSizeChange:(BOOL)flag;
+- (BOOL) resizeViewOnVideoSizeChange;
 
 /* Delegate methods */
 - (id) delegate;
diff --git a/src/video_out/macosx/video_window.m b/src/video_out/macosx/video_window.m
index 20d311337..8381dfaea 100644
--- a/src/video_out/macosx/video_window.m
+++ b/src/video_out/macosx/video_window.m
@@ -78,7 +78,7 @@ NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification";
                       screen: aScreen];
 
     xineView = [[XineOpenGLView alloc] initWithFrame:rect];
-    [xineView setResizeViewToVideoSizeOnLoad:YES];
+    [xineView setResizeViewOnVideoSizeChange:YES];
 
     /* receive notifications about window resizing from the xine view */
     [xineView setDelegate:self];
@@ -157,14 +157,14 @@ NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification";
     return keepsVideoAspectRatio;
 }
 
-- (void) setResizeViewToVideoSizeOnLoad:(BOOL)flag
+- (void) setResizeViewOnVideoSizeChange:(BOOL)flag
 {
-    resizeViewToVideoSizeOnLoad = flag;
+    resizeViewOnVideoSizeChange = flag;
 }
 
-- (BOOL) resizeViewToVideoSizeOnLoad
+- (BOOL) resizeViewOnVideoSizeChange
 {
-    return resizeViewToVideoSizeOnLoad;
+    return resizeViewOnVideoSizeChange;
 }
 
 - (BOOL)mouseDownCanMoveWindow {
@@ -235,8 +235,8 @@ NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification";
     self = [self initWithFrame:[self frame]];
 
     keepsVideoAspectRatio = [coder decodeBoolForKey:@"keepsVideoAspectRatio"];
-    resizeViewToVideoSizeOnLoad = [coder decodeBoolForKey:
-        @"resizeViewToVideoSizeOnLoad"];
+    resizeViewOnVideoSizeChange = [coder decodeBoolForKey:
+        @"resizeViewOnVideoSizeChange"];
 
     return self;
 }
@@ -244,8 +244,8 @@ NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification";
 - (void) encodeWithCoder:(NSCoder *)coder
 {
     [coder encodeBool:keepsVideoAspectRatio forKey:@"keepsVideoAspectRatio"];
-    [coder encodeBool:resizeViewToVideoSizeOnLoad
-               forKey:@"resizeViewToVideoSizeOnLoad"];
+    [coder encodeBool:resizeViewOnVideoSizeChange
+               forKey:@"resizeViewOnVideoSizeChange"];
 
     [super encodeWithCoder:coder];
 }
@@ -593,6 +593,9 @@ NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification";
     video_width = size.width;
     video_height = size.height;
 
+    if (resizeViewOnVideoSizeChange)
+	[self setViewSizeInMainThread:size];
+
     [self initTextures];
 }