From ea810bf683409ef7000f29aff9627f7ce13ca0bb Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Thu, 31 Mar 2016 15:55:25 -0700
Subject: [PATCH] Screenshot: Ignore delay on Print Screen

The delay variable is only considered when you push the
"New screenshot" button as suggested by diver.

Fixes #11447
---
 src/apps/screenshot/ScreenshotWindow.cpp | 15 +++++++++------
 src/apps/screenshot/ScreenshotWindow.h   |  3 ++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp
index 23f17063db..113448c40b 100644
--- a/src/apps/screenshot/ScreenshotWindow.cpp
+++ b/src/apps/screenshot/ScreenshotWindow.cpp
@@ -140,7 +140,7 @@ ScreenshotWindow::ScreenshotWindow(const Utility& utility, bool silent,
 
 	// Check if fUtility contains valid data
 	if (fUtility.wholeScreen == NULL) {
-		_NewScreenshot(silent, clipboard);
+		_NewScreenshot(silent, clipboard, true);
 		return;
 	}
 
@@ -391,15 +391,18 @@ ScreenshotWindow::Quit()
 
 
 void
-ScreenshotWindow::_NewScreenshot(bool silent, bool clipboard)
+ScreenshotWindow::_NewScreenshot(bool silent, bool clipboard, bool ignoreDelay)
 {
 	BMessage message(B_ARGV_RECEIVED);
 	int32 argc = 3;
-	BString delay;
-	delay << fDelay / 1000000;
 	message.AddString("argv", "screenshot");
-	message.AddString("argv", "--delay");
-	message.AddString("argv", delay);
+
+	if (!ignoreDelay) {
+		BString delay;
+		delay << fDelay / 1000000;
+		message.AddString("argv", "--delay");
+		message.AddString("argv", delay);
+	}
 
 	if (silent || clipboard) {
 		if (silent) {
diff --git a/src/apps/screenshot/ScreenshotWindow.h b/src/apps/screenshot/ScreenshotWindow.h
index 0e9726dc54..cdb01483e1 100644
--- a/src/apps/screenshot/ScreenshotWindow.h
+++ b/src/apps/screenshot/ScreenshotWindow.h
@@ -40,7 +40,8 @@ public:
 
 private:
 			void			_NewScreenshot(bool silent = false,
-								bool clipboard = false);
+								bool clipboard = false,
+								bool ignoreDelay = false);
 			void			_UpdatePreviewPanel();
 			void			_DisallowChar(BTextView* textView);
 			void			_SetupOutputPathMenu(const BMessage& settings);