github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 14:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added the FEATURE-998 also to the open last file context menu.

Browse source
This commit is contained in:
Robin 2017-01-12 21:26:30 +01:00
commit 96b92df495
3 changed files with 58 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Greenshot/Forms/MainForm.cs
View file

@ -1321,30 +1321,7 @@ namespace Greenshot {
}
}
if (path != null) {
try {
// Check if path is a directory
if (Directory.Exists(path))
{
using (Process.Start(path))
{
}
}
// Check if path is a file
else if (File.Exists(path))
{
// Start the explorer process and select the file
using (var explorer = Process.Start("explorer.exe", $"/select,\"{path}\""))
{
explorer?.WaitForInputIdle(500);
}
}
} catch (Exception ex) {
// Make sure we show what we tried to open in the exception
ex.Data.Add("path", path);
throw;
}
}
ExplorerHelper.OpenInExplorer(path);
break;
case ClickActions.OPEN_LAST_IN_EDITOR:
if (File.Exists(_conf.OutputFileAsFullpath)) {
@ -1381,7 +1358,7 @@ namespace Greenshot {
}
LOG.Debug("DoubleClick was called! Starting: " + path);
try {
Process.Start(path);
ExplorerHelper.OpenInExplorer(path);
} catch (Exception ex) {
// Make sure we show what we tried to open in the exception
ex.Data.Add("path", path);

18
Greenshot/Helpers/CaptureHelper.cs
View file

@ -512,22 +512,14 @@ namespace Greenshot.Helpers {
string errorMessage = null;
var path = Path.GetDirectoryName(surface.LastSaveFullPath);
try {
if (path != null)
{
var processStartInfo = new ProcessStartInfo("explorer.exe")
{
Arguments = path,
UseShellExecute = false
};
using (var process = new Process()) {
process.StartInfo = processStartInfo;
process.Start();
}
}
} catch (Exception ex) {
ExplorerHelper.OpenInExplorer(path);
}
catch (Exception ex)
{
errorMessage = ex.Message;
}
// Added fallback for when the explorer can't be found
// TODO: Check if this makes sense
if (errorMessage != null) {
try {
string windowsPath = Environment.GetEnvironmentVariable("SYSTEMROOT");