Some small fixes for bugs which showed up while using the current version. In this case there was an issue with the ExportInfomation passing, an export to Outlook wasn't reported as done causing the destination picker to show again after the export.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2060 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-09-19 12:30:27 +00:00
commit 4be78dddd4
4 changed files with 19 additions and 16 deletions

View file

@ -218,14 +218,16 @@ namespace Greenshot.Destinations {
foreach (string inspectorCaption in inspectorCaptions.Keys) {
destinations.Add(new EmailDestination(inspectorCaption, inspectorCaptions[inspectorCaption]));
}
PickerDestination.ShowPickerMenu(false, surface, captureDetails, destinations);
// Return the ExportInformation from the picker without processing, as this indirectly comes from us self
return PickerDestination.ShowPickerMenu(false, surface, captureDetails, destinations);
}
} else {
OutlookEmailExporter.ExportToOutlook(conf.OutlookEmailFormat, tmpFile, FilenameHelper.FillPattern(conf.EmailSubjectPattern, captureDetails, false), attachmentName, conf.EmailTo, conf.EmailCC, conf.EmailBCC);
exportInformation.ExportMade = true;
}
OutlookEmailExporter.ExportToOutlook(conf.OutlookEmailFormat, tmpFile, FilenameHelper.FillPattern(conf.EmailSubjectPattern, captureDetails, false), attachmentName, conf.EmailTo, conf.EmailCC, conf.EmailBCC);
}
}
ProcessExport(exportInformation, surface);
return exportInformation;
}
}