From: sdottaka <sdottaka@sourceforge.net>
Date: Sat, 22 Feb 2014 04:55:12 +0000 (+0900)
Subject: Even if drag&droped without Ctrl pressed, do recursive compare if checked "Include... 
X-Git-Tag: 2.16.5~1517^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f3c0b21e215d5e30da2c54c531bdb212788ee503;p=winmerge-jp%2Fwinmerge-jp.git

Even if drag&droped without Ctrl pressed, do recursive compare if checked "Include subfolders" on OpenView

--HG--
branch : stable
---

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 05390b28b..6675430fe 100644
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1764,7 +1764,7 @@ void CMainFrame::OnDropFiles(HDROP dropInfo)
 	const size_t fileCount = files.GetSize();
 
 	// If Ctrl pressed, do recursive compare
-	bool ctrlKey = !!::GetAsyncKeyState(VK_CONTROL);
+	bool recurse = !!::GetAsyncKeyState(VK_CONTROL) || !!theApp.GetProfileInt(_T("Settings"), _T("Recurse"), 0);
 
 	// If user has <Shift> pressed with one file selected,
 	// assume it is an archive and set filenames to same
@@ -1789,7 +1789,7 @@ void CMainFrame::OnDropFiles(HDROP dropInfo)
 		}
 	}
 
-	DoFileOpen(&files, dwFlags, ctrlKey);
+	DoFileOpen(&files, dwFlags, recurse);
 }
 
 BOOL CMainFrame::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)