PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues

  Submitted by Jochen, apply some parts now:
  Cannot create valid (archive) temp paths without valid document pointer

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 8a3bee4..2dfe9a5 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1259,6 +1259,11 @@ BOOL CMainFrame::DoFileOpen(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*
                if (Merge7z::Format *piHandler = Merge7z->GuessFormat(strLeft))
                {
                        pathsType = IS_EXISTING_DIR;
+                       // Need DirDoc here to build temp path
+                       if (!pDirDoc)
+                       {
+                               pDirDoc = GetDirDocToShow(&docNull);
+                       }
                        if (strRight == strLeft)
                        {
                                strRight.Empty();

diff --git a/Src/readme.txt b/Src/readme.txt
index 66fbfed..cdc38f6 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -13,6 +13,8 @@
    Src: DirCompStateBar.cpp
   Misc cleanups and optimizations
    Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h
+  Cannot create valid (archive) temp paths without valid document pointer
+   Src: MainFrm.cpp
 
 2005-06-29 Perry
  PATCH: [ 1220421 ] warning in cvs trunk (probably a bool/BOOL mismatch)