4.424.42

5 files changed, 15 insertions, 11 deletions

diff --git a/7zip/FileManager/PanelItemOpen.cpp b/7zip/FileManager/PanelItemOpen.cpp
index fa6ce849..c08581a8 100755
--- a/7zip/FileManager/PanelItemOpen.cpp
+++ b/7zip/FileManager/PanelItemOpen.cpp
@@ -434,11 +434,15 @@ void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal,
   CRecordVector<UInt32> indices;
   indices.Add(index);
 
-  HRESULT result = CopyTo(indices, tempDirNorm, false, true, 0);
+  UStringVector messages;
+  HRESULT result = CopyTo(indices, tempDirNorm, false, true, &messages);
 
-  if ((result != S_OK && result != E_ABORT))
+  if (!messages.IsEmpty())
+    return;
+  if (result != S_OK)
   {
-    MessageBoxError(result);
+    if (result != E_ABORT)
+      MessageBoxError(result);
     return;
   }
 
diff --git a/7zip/MyVersion.h b/7zip/MyVersion.h
index 70404564..39bcb475 100755
--- a/7zip/MyVersion.h
+++ b/7zip/MyVersion.h
@@ -1,8 +1,8 @@
 #define MY_VER_MAJOR 4
-#define MY_VER_MINOR 41
+#define MY_VER_MINOR 42
 #define MY_VER_BUILD 0
-#define MY_VERSION "4.41 beta"
-#define MY_7ZIP_VERSION "7-Zip 4.41 beta"
-#define MY_DATE "2006-05-09"
+#define MY_VERSION "4.42"
+#define MY_7ZIP_VERSION "7-Zip 4.42"
+#define MY_DATE "2006-05-14"
 #define MY_COPYRIGHT "Copyright (c) 1999-2006 Igor Pavlov"
 #define MY_VERSION_COPYRIGHT_DATE MY_VERSION "  " MY_COPYRIGHT "  " MY_DATE
diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi
index 583d2fc8..4d41dee2 100755
--- a/DOC/7zip.nsi
+++ b/DOC/7zip.nsi
@@ -2,8 +2,8 @@
 ;Defines
 
 !define VERSION_MAJOR 4
-!define VERSION_MINOR 41
-!define VERSION_POSTFIX_FULL " beta"
+!define VERSION_MINOR 42
+!define VERSION_POSTFIX_FULL ""
 !ifdef WIN64
 !ifdef IA64
 !define VERSION_SYS_POSTFIX_FULL " for Windows IA-64"
diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs
index 648aa35e..2da0d57d 100755
--- a/DOC/7zip.wxs
+++ b/DOC/7zip.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <?define VerMajor = "4" ?>
-<?define VerMinor = "41" ?>
+<?define VerMinor = "42" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>
diff --git a/DOC/readme.txt b/DOC/readme.txt
index 269ce4bb..2454d7d7 100755
--- a/DOC/readme.txt
+++ b/DOC/readme.txt
@@ -1,4 +1,4 @@
-7-Zip 4.41 Sources
+7-Zip 4.42 Sources
 ------------------
 
 7-Zip is a file archiver for Windows 95/98/ME/NT/2000/2003/XP.