github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 13:10:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making sure there is no IE capture, if the setting is disabled. Although I couldn't find any evidence that there is a bug here, as reported, this doesn't hurt.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2103 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-09-28 10:30:57 +00:00
commit d9f77270f5
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Greenshot/Forms/MainForm.cs
View file

@ -533,9 +533,11 @@ namespace Greenshot {
if (!RegisterWrapper(failedKeys, "CaptureLastRegion", "LastregionHotkey", new HotKeyHandler(instance.CaptureLastRegion))) { if (!RegisterWrapper(failedKeys, "CaptureLastRegion", "LastregionHotkey", new HotKeyHandler(instance.CaptureLastRegion))) {
success = false; success = false;
} }
if (conf.IECapture) {
if (!RegisterWrapper(failedKeys, "CaptureIE", "IEHotkey", new HotKeyHandler(instance.CaptureIE))) { if (!RegisterWrapper(failedKeys, "CaptureIE", "IEHotkey", new HotKeyHandler(instance.CaptureIE))) {
success = false; success = false;
} }
}
if (!success) { if (!success) {
MessageBox.Show(Language.GetFormattedString(LangKey.warning_hotkeys, failedKeys.ToString()),Language.GetString(LangKey.warning)); MessageBox.Show(Language.GetFormattedString(LangKey.warning_hotkeys, failedKeys.ToString()),Language.GetString(LangKey.warning));
@ -597,8 +599,10 @@ namespace Greenshot {
} }
void CaptureIE() { void CaptureIE() {
if (conf.IECapture) {
CaptureHelper.CaptureIE(true, null); CaptureHelper.CaptureIE(true, null);
} }
}
void CaptureWindow() { void CaptureWindow() {
if (conf.CaptureWindowsInteractive) { if (conf.CaptureWindowsInteractive) {