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

Additional fix for #1499

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2568 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-04-18 15:15:05 +00:00
commit 7275ad6222
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Greenshot/Helpers/CaptureHelper.cs
View file

@ -594,6 +594,8 @@ namespace Greenshot.Helpers {
balloonTipClickedHandler = delegate(object sender, EventArgs e) { balloonTipClickedHandler = delegate(object sender, EventArgs e) {
if (eventArgs.MessageType == SurfaceMessageTyp.FileSaved) { if (eventArgs.MessageType == SurfaceMessageTyp.FileSaved) {
if (!string.IsNullOrEmpty(surface.LastSaveFullPath)) { if (!string.IsNullOrEmpty(surface.LastSaveFullPath)) {
string errorMessage = null;
try { try {
ProcessStartInfo psi = new ProcessStartInfo("explorer.exe"); ProcessStartInfo psi = new ProcessStartInfo("explorer.exe");
psi.Arguments = Path.GetDirectoryName(surface.LastSaveFullPath); psi.Arguments = Path.GetDirectoryName(surface.LastSaveFullPath);
@ -602,7 +604,27 @@ namespace Greenshot.Helpers {
p.StartInfo = psi; p.StartInfo = psi;
p.Start(); p.Start();
} catch (Exception ex) { } catch (Exception ex) {
MessageBox.Show(string.Format("{0}\r\nexplorer.exe {1}", ex.Message, surface.LastSaveFullPath), "explorer.exe", MessageBoxButtons.OK, MessageBoxIcon.Error); errorMessage = ex.Message;
}
// Added fallback for when the explorer can't be found
if (errorMessage != null) {
try {
string windowsPath = Environment.GetFolderPath(Environment.SpecialFolder.Windows);
string explorerPath = Path.Combine(windowsPath, "explorer.exe");
if (File.Exists(explorerPath)) {
ProcessStartInfo psi = new ProcessStartInfo(explorerPath);
psi.Arguments = Path.GetDirectoryName(surface.LastSaveFullPath);
psi.UseShellExecute = false;
Process p = new Process();
p.StartInfo = psi;
p.Start();
errorMessage = null;
}
} catch {
}
}
if (errorMessage != null) {
MessageBox.Show(string.Format("{0}\r\nexplorer.exe {1}", errorMessage, surface.LastSaveFullPath), "explorer.exe", MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
} }
} else { } else {