Changeset 65 for trunk/src/gui/tray/trayicon_win.cpp

Timestamp:

01/12/06 01:20:21 (3 years ago)

Author:

hipplej

Message:

Fixed the tray icon bug in Win32, for now. Problem was in sysUpdateIcon, fixed using updated code found in patch for Psi.

Files:

• trunk/src/gui/tray/trayicon_win.cpp (modified) (1 diff)

trunk/src/gui/tray/trayicon_win.cpp

@@ -291 +291 @@
 TrayIcon::sysUpdateIcon()
 {
-  if (d) {
-    if (d->hMask) {
-      ptrDeleteObject( d->hMask );
-      d->hMask = 0; // michalj
-    }
-    if (d->hIcon) {
-      DestroyIcon(d->hIcon);
+  if ( d ) {
+    if ( d->hMask )
+      if ( d->hMask ) {
+        ptrDeleteObject( d->hMask );
+        if ( d->hIcon ) {
+          d->hMask = 0; // michalj
+        }
+      }
+    if ( d->hIcon ) {
+      DestroyIcon( d->hIcon );
       d->hIcon = 0; // michalj
     }
-
-    d->hIcon = createIcon(pm, d->hMask);
-    d->trayMessage(NIM_MODIFY);
+    
+    d->hMask = createIconMask( pm );
+                d->hIcon = createIcon( pm, d->hMask );
+                d->trayMessage( NIM_MODIFY );
   }
 }