4.27 beta

7zip/UI/GUI/CompressDialog.cpp

@@ -509,20 +509,8 @@ void CCompressDialog::OnOK()
   _passwordControl.GetText(Info.Password);
 
   SaveOptionsInMem();
-  int currentItem = m_ArchivePath.GetCurSel();
   UString s;
-  if(currentItem == CB_ERR)
-  {
-    m_ArchivePath.GetText(s);
-    if(m_ArchivePath.GetCount() >= kHistorySize)
-      currentItem = m_ArchivePath.GetCount() - 1;
-  }
-  else
-  {
-    CSysString sTemp;
-    m_ArchivePath.GetLBText(currentItem, sTemp);
-    s = GetUnicodeString(sTemp);
-  }
+  m_ArchivePath.GetText(s);
   s.Trim();
   m_RegistryInfo.HistoryArchives.Clear();
   AddUniqueString(m_RegistryInfo.HistoryArchives, GetSystemString(s));
@@ -555,13 +543,14 @@ void CCompressDialog::OnOK()
     }
 
   for(int i = 0; i < m_ArchivePath.GetCount(); i++)
-    if(i != currentItem)
-    {
-      CSysString sTemp;
-      m_ArchivePath.GetLBText(i, sTemp);
-      sTemp.Trim();
-      AddUniqueString(m_RegistryInfo.HistoryArchives, sTemp);
-    }
+  {
+    CSysString sTemp;
+    m_ArchivePath.GetLBText(i, sTemp);
+    sTemp.Trim();
+    AddUniqueString(m_RegistryInfo.HistoryArchives, sTemp);
+  }
+  if (m_RegistryInfo.HistoryArchives.Size() > kHistorySize)
+    m_RegistryInfo.HistoryArchives.DeleteBack();
   
   ////////////////////
   // Method

7zip/UI/GUI/GUI.dsp

@@ -847,6 +847,14 @@ SOURCE=..\..\Common\FileStreams.cpp
 
 SOURCE=..\..\Common\FileStreams.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\StreamUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\StreamUtils.h
+# End Source File
 # End Group
 # Begin Group "Compress"
 

7zip/UI/GUI/makefile

@@ -50,6 +50,7 @@ WIN_CTRL_OBJS = \
 7ZIP_COMMON_OBJS = \
   $O\FilePathAutoRename.obj \
   $O\FileStreams.obj \
+  $O\StreamUtils.obj \
 
 UI_COMMON_OBJS = \
   $O\ArchiveCommandLine.obj \