9.06 beta

1 files changed, 10 insertions, 11 deletions

diff --git a/CPP/7zip/UI/Far/PluginWrite.cpp b/CPP/7zip/UI/Far/PluginWrite.cpp
index 44c6fecd..4226aa5c 100755
--- a/CPP/7zip/UI/Far/PluginWrite.cpp
+++ b/CPP/7zip/UI/Far/PluginWrite.cpp
@@ -78,7 +78,7 @@ NFileOperationReturnCode::EEnum CPlugin::PutFiles(
   const int kXMid = 38;
 
   NCompression::CInfo compressionInfo;
-  ReadCompressionInfo(compressionInfo);
+  compressionInfo.Load();
 
   int methodIndex = 0;
   int i;
@@ -145,16 +145,16 @@ NFileOperationReturnCode::EEnum CPlugin::PutFiles(
   else if (dialogItems[kModeRadioIndex + 1].Selected)
     actionSet = &kUpdateActionSet;
   else if (dialogItems[kModeRadioIndex + 2].Selected)
-      actionSet = &kFreshActionSet;
+    actionSet = &kFreshActionSet;
   else if (dialogItems[kModeRadioIndex + 3].Selected)
-      actionSet = &kSynchronizeActionSet;
+    actionSet = &kSynchronizeActionSet;
   else
     throw 51751;
 
-  SaveCompressionInfo(compressionInfo);
+  compressionInfo.Save();
 
   NWorkDir::CInfo workDirInfo;
-  ReadWorkDirInfo(workDirInfo);
+  workDirInfo.Load();
   UString workDir = GetWorkDir(workDirInfo, m_FileName);
   CreateComplexDirectory(workDir);
 
@@ -425,8 +425,7 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
   }
 
   NCompression::CInfo compressionInfo;
-  // CZipRegistryManager aZipRegistryManager;
-  ReadCompressionInfo(compressionInfo);
+  compressionInfo.Load();
   
   int archiverIndex = 0;
 
@@ -442,7 +441,7 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
       {
         if (archiverIndex == -1)
           archiverIndex = i;
-        if (arcInfo.Name.CompareNoCase(compressionInfo.ArchiveType) == 0)
+        if (arcInfo.Name.CompareNoCase(compressionInfo.ArcType) == 0)
           archiverIndex = i;
       }
     }
@@ -647,11 +646,11 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
   }
 
   const CArcInfoEx &archiverInfoFinal = codecs->Formats[archiverIndex];
-  compressionInfo.ArchiveType = archiverInfoFinal.Name;
-  SaveCompressionInfo(compressionInfo);
+  compressionInfo.ArcType = archiverInfoFinal.Name;
+  compressionInfo.Save();
 
   NWorkDir::CInfo workDirInfo;
-  ReadWorkDirInfo(workDirInfo);
+  workDirInfo.Load();
 
   UString fullArchiveName;
   if (!MyGetFullPathName(archiveName, fullArchiveName))