[ros-diffs] [rharabien] 51531: [DESK] * Fix a bug when after changing color scheme Apply and then OK is clicked. Background color was restored to the previous one in this case. Spotted by Gabriel Ilardi.

[rharabien]

Author: rharabien
Date: Sun May  1 15:07:35 2011
New Revision: 51531

URL: http://svn.reactos.org/svn/reactos?rev=51531&view=rev
Log:
[DESK]
* Fix a bug when after changing color scheme Apply and then OK is clicked. 
Background color was restored to the previous one in this case. Spotted by 
Gabriel Ilardi.

Modified:
    trunk/reactos/dll/cpl/desk/appearance.c

Modified: trunk/reactos/dll/cpl/desk/appearance.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?rev=51531&r1=51530&r2=51531&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Sun May  1 15:07:35 
2011
@@ -115,12 +115,14 @@
                                                                           
hwndDlg, AdvAppearanceDlgProc, (LPARAM)g) == IDOK)
                                        {
                                                
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                                               g->bHasChanged = TRUE;
                                                g->Theme = g->ThemeAdv;
-                                           g_GlobalData.desktop_color = 
g->Theme.crColor[COLOR_DESKTOP];
-                                               g->bHasChanged = TRUE;
                                                g->ThemeId = -1;        /* 
Customized */
+                                               g_GlobalData.desktop_color = 
g->Theme.crColor[COLOR_DESKTOP];
+
                                                SendDlgItemMessage(hwndDlg, 
IDC_APPEARANCE_COLORSCHEME, CB_SETCURSEL, (WPARAM)-1, 0);
                                                SetDlgItemText(hwndDlg, 
IDC_APPEARANCE_COLORSCHEME, TEXT(""));
+
                                                SendDlgItemMessage(hwndDlg, 
IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->Theme);
                                        }
                                        break;
@@ -136,6 +138,7 @@
                                                {
                                                        g->Theme = Theme;
                                                        g->ThemeId = ThemeId;
+                                                       
g_GlobalData.desktop_color = g->Theme.crColor[COLOR_DESKTOP];
                                                        
SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, 
(LPARAM)&Theme);
                                                }
                                        }