Fix build error and show fold icon at submodule directory

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp
index 330c775..9720e0b 100644 (file)
--- a/src/Git/GitStatusListCtrl.cpp
+++ b/src/Git/GitStatusListCtrl.cpp
@@ -1408,9 +1408,9 @@ void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listInde
        int nCol = 1;\r
        CString entryname = GitPath->GetGitPathString();\r
        int icon_idx = 0;\r
        int nCol = 1;\r
        CString entryname = GitPath->GetGitPathString();\r
        int icon_idx = 0;\r

-//     if (entry->isfolder)\r
-//             icon_idx = m_nIconFolder;\r
-//     else\r
+       if (GitPath->IsDirectory())\r
+               icon_idx = m_nIconFolder;\r
+       else\r

        {\r
                icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);\r
        }\r
        {\r
                icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);\r
        }\r

diff --git a/src/TortoiseProc/Commands/FormatPatchCommand.cpp b/src/TortoiseProc/Commands/FormatPatchCommand.cpp
index d7ef5ba..cb1cf1e 100644 (file)
--- a/src/TortoiseProc/Commands/FormatPatchCommand.cpp
+++ b/src/TortoiseProc/Commands/FormatPatchCommand.cpp
@@ -62,7 +62,7 @@ bool FormatPatchCommand::Execute()
                CShellUpdater::Instance().AddPathForUpdate(CTGitPath(dlg.m_Dir));\r
                CShellUpdater::Instance().Flush();\r
                \r
                CShellUpdater::Instance().AddPathForUpdate(CTGitPath(dlg.m_Dir));\r
                CShellUpdater::Instance().Flush();\r
                \r

-               return !dlg.m_GitStatus;\r
+               return !progress.m_GitStatus;\r

        }\r
        return FALSE;\r
 }\r
        }\r
        return FALSE;\r
 }\r