Changeset 1434 for trunk/dll/filldir.c

Timestamp:

Jun 23, 2009, 12:52:05 AM (16 years ago)

Author:

Gregg Young

Message:

Update show label or FS in tree to initialize as driveonly and fixed typo which caused rescan to fail after the value was changed. Renamed some variables.

File:

• trunk/dll/filldir.c (modified) (6 diffs)

trunk/dll/filldir.c

@@ -877 +877 @@
   else
     p = pci->pszFileName;
-  if (szFSType && (fShowSysType || fShowLabel)) {
+  if (szFSType && (fShowFSTypeInTree || fShowDriveLabelInTree)) {
     strcpy(szBuf, p);
     strcat(szBuf, " [");
@@ -1457 +1457 @@
             }
           }
-          if (strcmp(volser.volumelabel, "") != 0 && FSInfo && fShowLabel)
+          if (strcmp(volser.volumelabel, "") != 0 && FSInfo && fShowDriveLabelInTree)
             strcpy(szFSType, volser.volumelabel);
           pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
@@ -1487 +1487 @@
               sprintf(suggest + strlen(suggest), "%c" , toupper(*szDrive));
               pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-              if (fShowSysType || fShowLabel) {
+              if (fShowFSTypeInTree || fShowDriveLabelInTree) {
                 strcat(szDrive, " [");
                 strcat(szDrive, szFSType);
@@ -1505 +1505 @@
             // Removable volume
             pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-            if (fShowSysType || fShowLabel) {
+            if (fShowFSTypeInTree || fShowDriveLabelInTree) {
               strcat(szDrive, " [");
               strcat(szDrive, szFSType);
@@ -1525 +1525 @@
           pci->rc.hptrIcon = hptrDunno;
           pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-          if (fShowSysType || fShowLabel) {
+          if (fShowFSTypeInTree || fShowDriveLabelInTree) {
             strcat(szDrive, " [");
             strcat(szDrive, szFSType);
@@ -1546 +1546 @@
         pci->rc.hptrIcon = hptrFloppy;
         pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-        if (fShowSysType || fShowLabel)
+        if (fShowFSTypeInTree || fShowDriveLabelInTree)
           strcat(szDrive, "  [Floppy]");
         pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);