* Merged trunk changeset 9319 to 0.8.1 branch.

modules/gui/skins2/src/generic_window.hpp

@@ -76,6 +76,9 @@ class GenericWindow: public SkinObject, public Observer<VarBool>
         /// Give access to the visibility variable
         VarBool &getVisibleVar() { return m_varVisible; }
 
+        /// Window type, mainly useful when overloaded (for VoutWindow)
+        virtual string getType() const { return "Generic"; }
+
     protected:
         /// Get the OS window
         OSWindow *getOSWindow() const { return m_pOsWindow; }

modules/gui/skins2/src/vout_window.hpp

@@ -56,6 +56,8 @@ class VoutWindow: public GenericWindow
         /// Refresh an area of the window
         virtual void refresh( int left, int top, int width, int height );
 
+        virtual string getType() const { return "Vout"; }
+
     private:
         /// Image when there is no video
         OSGraphics *m_pImage;

modules/gui/skins2/win32/win32_loop.cpp

@@ -129,7 +129,12 @@ void Win32Loop::run()
                                 Infos.rcPaint.right - Infos.rcPaint.left + 1,
                                 Infos.rcPaint.bottom - Infos.rcPaint.top + 1 );
                 EndPaint( msg.hwnd, &Infos );
+                // Ignore all the painting events for the vout window,
+                // otherwise we are going to screw up the colorkey
+                if( win.getType() != "Vout" )
+                {
                     win.processEvent( evt );
+                }
                 break;
             }
             case WM_MOUSEMOVE: