.tar.xxxを弾くタイミングを変更。

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

diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index 206da5c..7a6d128 100644 (file)
--- a/src/plugin/7zArc/7zArc.cpp
+++ b/src/plugin/7zArc/7zArc.cpp
@@ -798,6 +798,13 @@ int __stdcall OpenArchive
        void * * _hArchive\r
 )\r
 {\r
+       // ***.tar.xxxは不便なので弾く。\r
+       wxString s = _szArcName.BeforeLast(wxT('.'));\r
+       if (s.Find(wxT('.')) != wxNOT_FOUND && s.AfterLast(wxT('.')) == wxT("tar"))\r
+       {\r
+               return TPI_ERROR_IO_ARC_OPEN;\r
+       }\r
+\r
        // 書庫形式を認識。\r
        IInArchive * hArc;\r
        for (wxULongLong_t i = 0; i < sizeof(guidList) / sizeof(GUID); )\r
@@ -808,14 +815,6 @@ int __stdcall OpenArchive
                        continue;\r
                }\r
 \r
-               // ***.tar.xxxは不便なので弾く。\r
-               wxString s = _szArcName.BeforeLast(wxT('.')); \r
-               if (s.Find(wxT('.')) != wxNOT_FOUND && s.AfterLast(wxT('.')) == wxT("tar"))\r
-               {\r
-                       i++;\r
-                       continue;\r
-               }\r
-\r
                // 書庫を開く。\r
                CInFileStream * fileSpec = new CInFileStream;\r
                CMyComPtr<IInStream> file = fileSpec;\r