[vlc-commits] macosx: make sure that the fspanel is always displayed on the same screen as the vout it belongs to

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Apr 22 19:42:31 2013 +0200| [4a51b48a12c4c8b6e9222cd717dea96b987367ab] | committer: Felix Paul Kühne

macosx: make sure that the fspanel is always displayed on the same screen as the vout it belongs to

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4a51b48a12c4c8b6e9222cd717dea96b987367ab
---

 modules/gui/macosx/fspanel.m |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m
index 4cf873a..b054e8e 100644
--- a/modules/gui/macosx/fspanel.m
+++ b/modules/gui/macosx/fspanel.m
@@ -357,9 +357,11 @@
         [o_vout_window release];
     o_vout_window = [o_window retain];
     int i_newdevice = (int)[[o_vout_window screen] displayID];
-    if (i_newdevice != i_device && i_device != 0)
+    if ((i_newdevice != i_device && i_device != 0) || i_newdevice != [[self screen] displayID]) {
+        i_device = i_newdevice;
         [self center];
-    i_device = i_newdevice;
+    } else
+        i_device = i_newdevice;
 }
 @end