]> git.sesse.net Git - vlc/commitdiff
activex: oops, used duplicate id for BITMAP resource
authorDamien Fouilleul <damienf@videolan.org>
Thu, 21 Feb 2008 11:47:59 +0000 (11:47 +0000)
committerDamien Fouilleul <damienf@videolan.org>
Thu, 21 Feb 2008 11:47:59 +0000 (11:47 +0000)
projects/activex/axvlc_rc.rc
projects/activex/plugin.cpp

index e6037d2676027d4278064d95d64fa6c5c5e77431..f4580bcad50a0bdb78f5b262eecb2f772d6e312b 100644 (file)
@@ -32,7 +32,7 @@ BEGIN
   END
 END
 
-1 BITMAP DISCARDABLE "inplace.bmp"
+2 BITMAP DISCARDABLE "inplace.bmp"
 
 1 TYPELIB "axvlc.tlb"
 
index e234c67fc17b161d67b229e2fe19e45da6b70957..85f612fdfd004681738bc9aea5853823f6dd91fc 100644 (file)
@@ -106,7 +106,7 @@ VLCPluginClass::VLCPluginClass(LONG *p_class_ref, HINSTANCE hInstance, REFCLSID
         _inplace_wndclass_atom = 0;
     }
 
-    HBITMAP hbitmap = (HBITMAP)LoadImage(getHInstance(), MAKEINTRESOURCE(1), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+    HBITMAP hbitmap = (HBITMAP)LoadImage(getHInstance(), MAKEINTRESOURCE(2), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
     if( NULL != hbitmap )
     {
         PICTDESC pictDesc;