when the archive has only one folder as its direct child, do not add filename to path by default on extraction; if not, add filename to path

CPP/7zip/UI/FileManager/CopyDialog.cpp

@@ -109,6 +109,9 @@ bool CCopyDialog::OnInit()
 		  }
 	  }
   }
+  if (soleDir == 0) {
+	OnButtonAddFileName();
+  }
   return CModalDialog::OnInit();
 }
 
@@ -267,6 +270,8 @@ void CCopyDialog::OnButtonAddFileName()
 		currentPath += m_strRealFileName;
 
 		_path.SetText(currentPath);
+	} else {
+		_path.SetText(currentPath.Mid(0, n));
 	}
 	_path.SetFocus();
 }