From 31456fc9dc617478f5e32442935ac82ea289e19e Mon Sep 17 00:00:00 2001 From: RKrom Date: Fri, 30 Jul 2010 16:06:00 +0000 Subject: [PATCH] Merge from branch for Exit problems git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@744 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- GreenshotEditor/Forms/ImageEditorForm.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/GreenshotEditor/Forms/ImageEditorForm.cs b/GreenshotEditor/Forms/ImageEditorForm.cs index 35d7a3980..9a279bc79 100644 --- a/GreenshotEditor/Forms/ImageEditorForm.cs +++ b/GreenshotEditor/Forms/ImageEditorForm.cs @@ -568,7 +568,12 @@ namespace Greenshot.Forms { void ImageEditorFormFormClosing(object sender, FormClosingEventArgs e) { if (!saved) { - DialogResult result = MessageBox.Show(lang.GetString(LangKey.editor_close_on_save), lang.GetString(LangKey.editor_close_on_save_title), MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question); + MessageBoxButtons buttons = MessageBoxButtons.YesNoCancel; + // Dissallow "CANCEL" if the application needs to shutdown + if (e.CloseReason == CloseReason.ApplicationExitCall || e.CloseReason == CloseReason.WindowsShutDown) { + buttons = MessageBoxButtons.YesNo; + } + DialogResult result = MessageBox.Show(lang.GetString(LangKey.editor_close_on_save), lang.GetString(LangKey.editor_close_on_save_title), buttons, MessageBoxIcon.Question); if (result.Equals(DialogResult.Cancel)) { e.Cancel = true; return;