Add Resolve to explore context menu

[tortoisegit/TortoiseGitJp.git] / src / Utils / ShellUpdater.cpp

diff --git a/src/Utils/ShellUpdater.cpp b/src/Utils/ShellUpdater.cpp
index 7356c1d..bbd8492 100644 (file)
--- a/src/Utils/ShellUpdater.cpp
+++ b/src/Utils/ShellUpdater.cpp
@@ -117,8 +117,8 @@ void CShellUpdater::UpdateShell()
                        CTGitPath path;\r
                        for(int nPath = 0; nPath < m_pathsForUpdating.GetCount(); nPath++)\r
                        {\r
                        CTGitPath path;\r
                        for(int nPath = 0; nPath < m_pathsForUpdating.GetCount(); nPath++)\r
                        {\r

-                               path.SetFromWin(g_Git.m_CurrentDir+_T("\\")+m_pathsForUpdating[nPath].GetDirectory().GetWinPathString());\r
-                               ATLTRACE(_T("Cache Item Update for %s (%d)\n"), path.GetDirectory().GetWinPathString(), GetTickCount());\r
+                               path.SetFromWin(g_Git.m_CurrentDir+_T("\\")+m_pathsForUpdating[nPath].GetWinPathString());\r
+                               ATLTRACE(_T("Cache Item Update for %s (%d)\n"), path.GetWinPathString(), GetTickCount());\r

                                if (!path.IsDirectory())\r
                                {\r
                                        // send notifications to the shell for changed files - folders are updated by the cache itself.\r
                                if (!path.IsDirectory())\r
                                {\r
                                        // send notifications to the shell for changed files - folders are updated by the cache itself.\r