Modify position of filter and date at log dialog

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / TortoiseProc.cpp

diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp
index d19c3d6..f1e4158 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.cpp
+++ b/src/TortoiseProc/TortoiseProc.cpp
@@ -128,7 +128,9 @@ BOOL CTortoiseProcApp::InitInstance()
        CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));\r
        CMFCButton::EnableWindowsTheming();\r
 \r
-       \r
+       Gdiplus::GdiplusStartupInput gdiplusStartupInput;\r
+       Gdiplus::GdiplusStartup(&m_gdiplusToken,&gdiplusStartupInput,NULL);\r
+\r
        if(!CheckMsysGitDir())\r
        {\r
                if(CMessageBox::Show(NULL,_T("MSysGit(http://code.google.com/p/msysgit) have not installed Correctly\n\\r
@@ -421,6 +423,8 @@ Click Yes to open setting dialog to setup MSysGit Path"),
 \r
                cmd->SetParser(parser);\r
                cmd->SetPaths(pathList, cmdLinePath);\r
+               \r
+               CGit::m_LogEncode = CAppUtils::GetLogOutputEncode();\r
 \r
                retSuccess = cmd->Execute();\r
                delete cmd;\r
@@ -616,6 +620,8 @@ void CTortoiseProcApp::EnableCrashHandler()
 \r
 int CTortoiseProcApp::ExitInstance()\r
 {\r
+       Gdiplus::GdiplusShutdown(m_gdiplusToken);\r
+\r
        CWinAppEx::ExitInstance();\r
        if (retSuccess)\r
                return 0;\r