Changeset 1093 for trunk/dll/notebook.c

Timestamp:

07/22/08 03:12:26 (4 months ago)

Author:

gyoung

Message:

Reverted CS 1092because of intermitant trap when a variable was removed.

Files:

• trunk/dll/notebook.c (modified) (2 diffs)

trunk/dll/notebook.c

@@ -1168 +1168 @@
 MRESULT EXPENTRY CfgTDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  BOOL fShowEnvChanged = FALSE;
-  BOOL fTreeEnvVarListChanged = FALSE;
-
   switch (msg) {
   case WM_INITDLG:
@@ -1263 +1260 @@
     PrfWriteProfileData(fmprof, FM3Str, "DoubleClickOpens", &fDCOpens,
                         sizeof(BOOL));
-    fShowEnvChanged = (fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV));
+    if (hwndTree && fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV))
+      PostMsg(WinWindowFromID
+              (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
+              MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
     fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
     PrfWriteProfileData(fmprof, appname, "ShowEnv", &fShowEnv, sizeof(BOOL));
     {
-      char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1, pszSrcFile, __LINE__);
+      char * pszTemp = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (pszTemp)
       {
         WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
         strupr(pszTemp);
-        if (strcmp(pszTemp, pszTreeEnvVarList)) {
-          fTreeEnvVarListChanged = TRUE;
+        if (strcmp(pszTemp, pszTreeEnvVarList))
+        {
           strcpy(pszTreeEnvVarList, pszTemp);
           PrfWriteProfileString(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList);
+          if (hwndTree && fShowEnv) {
+            PostMsg(WinWindowFromID
+                    (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
+                    MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          }
         }
         free(pszTemp);
       } else {
-        Runtime_Error(pszSrcFile, __LINE__, "Unable to allocate memory");
-      }
-      if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged)))
-      {
-        PCNRITEM pci = WinSendMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
-                                  MPFROMLONG(CMA_FIRST),
-                                  MPFROMSHORT(CRA_SELECTED));
-        PostMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
-                MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        PostMsg(hwndTree, UM_SHOWME, MPFROMP(pci->pszFileName), MPVOID);
-
+        // Report error?
       }
     }