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

BUG-1671: Fixed error that occurred when double-clicking systray icon before the first time a screenshot was saved to file

Browse source
This commit is contained in:
JKlingen 2014-10-01 23:03:45 +02:00
commit 42437772ad
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Greenshot/Forms/MainForm.cs
View file

@ -1249,13 +1249,18 @@ namespace Greenshot {
switch (clickAction) { switch (clickAction) {
case ClickActions.OPEN_LAST_IN_EXPLORER: case ClickActions.OPEN_LAST_IN_EXPLORER:
string path = null; string path = null;
string configPath = FilenameHelper.FillVariables(_conf.OutputFilePath, false); if (!string.IsNullOrEmpty(_conf.OutputFileAsFullpath)) {
string lastFilePath = Path.GetDirectoryName(_conf.OutputFileAsFullpath); string lastFilePath = Path.GetDirectoryName(_conf.OutputFileAsFullpath);
if (lastFilePath != null && Directory.Exists(lastFilePath)) { if (!string.IsNullOrEmpty(lastFilePath) && Directory.Exists(lastFilePath)) {
path = lastFilePath; path = lastFilePath;
} else if (Directory.Exists(configPath)) { }
path = configPath; }
} if (path == null) {
string configPath = FilenameHelper.FillVariables(_conf.OutputFilePath, false);
if (Directory.Exists(configPath)) {
path = configPath;
}
}
if (path != null) { if (path != null) {
try { try {

1
Greenshot/releases/additional_files/readme.txt.template
View file

@ -23,6 +23,7 @@ Bugs resolved:
* BUG-1610: Image editor: 'Obfuscate' and 'Highlight' and more, now should rotate / resize correctly. * BUG-1610: Image editor: 'Obfuscate' and 'Highlight' and more, now should rotate / resize correctly.
* BUG-1619: Image editor: Autocrop now also considers the elements. * BUG-1619: Image editor: Autocrop now also considers the elements.
* BUG-1653: Accessibility issues: Editor "File" menu entry can't be activated and missing translations * BUG-1653: Accessibility issues: Editor "File" menu entry can't be activated and missing translations
* BUG-1671: Fixed error that occurred when double-clicking systray icon before the first time a screenshot was saved to file
Changes: Changes:
* Dynamic destination context-menu: If a destination has child items the parent is still selectable and executes the default export, we now no longer repeat the parent in the children. * Dynamic destination context-menu: If a destination has child items the parent is still selectable and executes the default export, we now no longer repeat the parent in the children.