if (StriCmp(FileName, CONFIG_FILE_NAME) == 0) {
MyFreePool(GlobalConfig.AlsoScan);
GlobalConfig.AlsoScan = StrDuplicate(ALSO_SCAN_DIRS);
-// MyFreePool(GlobalConfig.DontScanVolumes);
-// GlobalConfig.DontScanVolumes = StrDuplicate(L" ");
MyFreePool(GlobalConfig.DontScanDirs);
- if (SelfVolume->VolName) {
- SelfPath = StrDuplicate(SelfVolume->VolName);
- } else {
- SelfPath = AllocateZeroPool(256 * sizeof(CHAR16));
- SPrint(SelfPath, 255, L"fs%d", SelfVolume->VolNumber);
- } // if/else
+ if (SelfVolume) {
+ if (SelfVolume->VolName) {
+ SelfPath = StrDuplicate(SelfVolume->VolName);
+ } else {
+ SelfPath = AllocateZeroPool(256 * sizeof(CHAR16));
+ if (SelfPath != NULL)
+ SPrint(SelfPath, 255, L"fs%d", SelfVolume->VolNumber);
+ } // if/else
+ }
MergeStrings(&SelfPath, SelfDirPath, L':');
GlobalConfig.DontScanDirs = SelfPath;
MyFreePool(GlobalConfig.DontScanFiles);
GlobalConfig.HideUIFlags |= HIDEUI_FLAG_HINTS;
} else if (StriCmp(FlagName, L"editor") == 0) {
GlobalConfig.HideUIFlags |= HIDEUI_FLAG_EDITOR;
+ } else if (StriCmp(FlagName, L"safemode") == 0) {
+ GlobalConfig.HideUIFlags |= HIDEUI_FLAG_SAFEMODE;
} else if (StriCmp(FlagName, L"all") == 0) {
GlobalConfig.HideUIFlags = HIDEUI_FLAG_ALL;
} else {
} else if ((StriCmp(TokenList[0], L"don't_scan_volumes") == 0) || (StriCmp(TokenList[0], L"dont_scan_volumes") == 0)) {
HandleStrings(TokenList, TokenCount, &(GlobalConfig.AlsoScan));
// Note: Don't use HandleStrings() because it modifies slashes, which might be present in volume name
- MyFreePool(GlobalConfig.DontScanVolumes);
- GlobalConfig.DontScanVolumes = NULL;
- for (i = 1; i < TokenCount; i++) {
- MergeStrings(&GlobalConfig.DontScanVolumes, TokenList[i], L',');
- }
+ MyFreePool(GlobalConfig.DontScanVolumes);
+ GlobalConfig.DontScanVolumes = NULL;
+ for (i = 1; i < TokenCount; i++) {
+ MergeStrings(&GlobalConfig.DontScanVolumes, TokenList[i], L',');
+ }
} else if ((StriCmp(TokenList[0], L"don't_scan_dirs") == 0) || (StriCmp(TokenList[0], L"dont_scan_dirs") == 0)) {
HandleStrings(TokenList, TokenCount, &(GlobalConfig.DontScanDirs));