tgz, tbz2, txzも7zArcで処理しないよう変更。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@632 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index 5b08b21..029c5b8 100644 (file)
--- a/src/plugin/7zArc/7zArc.cpp
+++ b/src/plugin/7zArc/7zArc.cpp
@@ -742,11 +742,13 @@ int __stdcall OpenArchive
        wxULongLong_t * _nFileCount\r
 )\r
 {\r
-       // ***.tar.xxxは不便なので弾く。\r
-       wxString s = _szArcName.BeforeLast(wxT('.'));\r
-       if (s.Find(wxT('.')) != wxNOT_FOUND && s.AfterLast(wxT('.')) == wxT("tar"))\r
+       // *.tar.xxx, *.tgz, *.tbz2, *.txzは不便なので弾く。\r
        {\r
-               return TPI_ERROR_IO_ARC_OPEN;\r
+               wxString s = _szArcName.BeforeLast(wxT('.')), t = _szArcName.AfterLast(wxT('.'));\r
+               if ((s.Find(wxT('.')) != wxNOT_FOUND && s.AfterLast(wxT('.')) == wxT("tar")) || t == wxT("tgz") || t == wxT("tbz2") || t == wxT("txz"))\r
+               {\r
+                       return TPI_ERROR_IO_ARC_OPEN;\r
+               }\r
        }\r
 \r
        // xml解析開始。\r