[Virtuawin-cvs] SetupDialog.c,1.62,1.63

[Steven P. <bj...@us...>]

Update of /cvsroot/virtuawin
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22725

Modified Files:
	SetupDialog.c 
Log Message:
Fixed uses of taskbar hwnd which didn't test for null first
Reworked some of the start-up and setup apply process it improve reliability.

Index: SetupDialog.c
===================================================================
RCS file: /cvsroot/virtuawin/SetupDialog.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- SetupDialog.c	5 Dec 2007 01:02:19 -0000	1.62
+++ SetupDialog.c	7 Dec 2007 01:09:52 -0000	1.63
@@ -75,8 +75,8 @@
         {
             // All pages have now got any changes from the GUI, save them and apply
             writeConfig();
-            getWorkArea();
             vwHotkeyUnregister();
+            vwIconLoad();              
             vwHotkeyRegister();
             enableMouse(mouseEnable);
             // Tell modules about the config change
@@ -87,6 +87,18 @@
     }
 }
 
+static void
+vwSetupCancel(void)
+{
+    if(pageChangeMask)
+    {
+        // Reset to the original values.
+        readConfig();
+        pageChangeMask = 0 ;
+        pageApplyMask = 0 ;
+    }
+}
+
 void
 initDesktopProperties(void)
 {
@@ -219,7 +231,6 @@
             nDesksY = tmpDesksY;
             nDesksX = tmpDesksX;
             nDesks = maxDesk ;
-            vwIconReload();              
             
             deskWrap = (SendDlgItemMessage(hDlg, IDC_DESKCYCLE, BM_GETCHECK, 0, 0) == BST_CHECKED) ;
             hiddenWindowAct = (vwUByte) SendDlgItemMessage(hDlg, IDC_HIDWINACT, CB_GETCURSEL, 0, 0) ;
@@ -243,8 +254,7 @@
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             return 1;
         case PSN_RESET: // Cancel
-            // Reset to the original values.
-            readConfig();
+            vwSetupCancel() ;
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             break;
         case PSN_HELP:
@@ -612,8 +622,7 @@
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             return 1;
         case PSN_RESET:
-            // Reset to the original values.
-            readConfig();
+            vwSetupCancel() ;
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             break;
         case PSN_HELP:
@@ -753,8 +762,7 @@
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             return 1;
         case PSN_RESET:
-            // Reset to the original values.
-            readConfig();
+            vwSetupCancel() ;
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             break;
         case PSN_HELP:
@@ -826,8 +834,6 @@
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             return 1;
         case PSN_RESET:
-            // Reset to the original values.
-            readConfig();
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             break;
         case PSN_HELP:
@@ -935,16 +941,8 @@
             noTaskbarCheck = (SendDlgItemMessage(hDlg, IDC_TASKBARDETECT, BM_GETCHECK, 0, 0) != BST_CHECKED) ;
             trickyWindows = (SendDlgItemMessage(hDlg, IDC_TRICKYSUPPORT, BM_GETCHECK, 0, 0) == BST_CHECKED) ;
             vwLogFlag = (SendDlgItemMessage(hDlg,IDC_DEBUGLOGGING,BM_GETCHECK, 0, 0) == BST_CHECKED) ;
-            if(SendDlgItemMessage(hDlg, IDC_DISPLAYICON, BM_GETCHECK, 0, 0) == BST_CHECKED)
-            {
-                displayTaskbarIcon = FALSE;
-                PostMessage(hWnd, VW_DELICON, 0, 0);
-            }
-            else
-            {
-                displayTaskbarIcon = TRUE;
-                PostMessage(hWnd, VW_SHOWICON, 0, 0);
-            }
+            displayTaskbarIcon = (SendDlgItemMessage(hDlg, IDC_DISPLAYICON, BM_GETCHECK, 0, 0) != BST_CHECKED) ;
+            
             vwSetupApply(hDlg,0x08) ;
             if(vwLogFlag != oldLogFlag)
             {
@@ -957,8 +955,7 @@
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             return 1;
         case PSN_RESET:
-            // Reset to the original values.
-            readConfig();
+            vwSetupCancel() ;
             SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
             break;
         case PSN_HELP: