1 files changed, 3 insertions, 1 deletions
diff --git a/CPP/7zip/UI/Far/ExtractEngine.cpp b/CPP/7zip/UI/Far/ExtractEngine.cpp
index c6583aae..2ffb14c1 100755
--- a/CPP/7zip/UI/Far/ExtractEngine.cpp
+++ b/CPP/7zip/UI/Far/ExtractEngine.cpp
@@ -101,13 +101,15 @@ STDMETHODIMP CExtractCallBackImp::AskOverwrite(
     *answer = NOverwriteAnswer::kAutoRename;
     break;
   default:
-    throw 20413;
+    return E_FAIL;
   }
   return S_OK;
 }
 
 STDMETHODIMP CExtractCallBackImp::PrepareOperation(const wchar_t *name, bool /* isFolder */, INT32 /* askExtractMode */, const UINT64 * /* position */)
 {
+  if(WasEscPressed())
+    return E_ABORT;
   m_CurrentFilePath = name;
   return S_OK;
 }