Check if maximum number of available numbered drives is exceeded

Author: Hermann Schinagl

src/wfgoto.cpp

@@ -597,15 +597,18 @@ SetCurrentPathOfWindow(LPWSTR szPath)
 {
 	HWND hwndActive = (HWND)SendMessage(hwndMDIClient, WM_MDIGETACTIVE, 0, 0L);
 
-	BOOL bOpenOnReplace = TRUE;
+	HWND hwndNew = nullptr;
 	if (ISUNCPATH(szPath)) 
 	{
 		// For UNC path this is the place of opening a new UNC window.
 		// Use CTRL+W to remove the number-drive mapping and close it
-		AddUNCDrive(szPath);
-		bOpenOnReplace = FALSE;
+		DRIVE freeDriveFound = AddUNCDrive(szPath);
+
+		if (freeDriveFound)
+			hwndNew = CreateDirWindow(szPath, FALSE, hwndActive);
 	}
-	HWND hwndNew = CreateDirWindow(szPath, bOpenOnReplace, hwndActive);
+	else
+		hwndNew = CreateDirWindow(szPath, TRUE, hwndActive);
 
 	HWND hwndTree = HasTreeWindow(hwndNew);
 	if (hwndTree)

src/wfutil.c

@@ -1630,7 +1630,7 @@ DRIVE FindUNCDrive(LPCTSTR path, PDWORD pdwFreeDriveSlot)
          // Added an UNC drive which already existed
          return dwDriveIndex;
 
-      // If we come across an empt yone, remember the first one
+      // If we come across an empty one, remember the first one
       if (!aDriveInfo[dwDriveIndex].szRoot[0] && !(*pdwFreeDriveSlot))
          *pdwFreeDriveSlot = dwDriveIndex;
    }
@@ -1641,7 +1641,7 @@ DRIVE AddUNCDrive(LPCTSTR path)
 {
    DWORD dwFreeDriveSlot = 0;
    DRIVE drive = FindUNCDrive(path, &dwFreeDriveSlot);
-   if (!drive){
+   if (!drive && dwFreeDriveSlot){
       // Havent't found an existing slot, so add new to first free found
       lstrcpy(aDriveInfo[dwFreeDriveSlot].szRoot, path);
       lstrcpy(aDriveInfo[dwFreeDriveSlot].szRootBackslash, path);