From 953aaafc13937134ce5dfa1fc60b9e3aae3ca5fc Mon Sep 17 00:00:00 2001
From: Wim van der Meer <wpjvandermeer@gmail.com>
Date: Sat, 29 May 2010 12:12:07 +0000
Subject: [PATCH] Patch Screenshot to not ignore the delay time setting from
 the command line. This fixes ticket #5862

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36969 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/screenshot/ScreenshotWindow.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp
index ec6e7726ee..5270cc4d18 100644
--- a/src/apps/screenshot/ScreenshotWindow.cpp
+++ b/src/apps/screenshot/ScreenshotWindow.cpp
@@ -128,6 +128,7 @@ ScreenshotWindow::ScreenshotWindow()
 	settings.FindInt64("delay", &fDelay);
 	settings.FindString("outputFilename", &fOutputFilename);
 
+	_TakeScreenshot(0);
 	_InitWindow(settings);
 	CenterOnScreen();
 	Show();
@@ -146,7 +147,7 @@ ScreenshotWindow::ScreenshotWindow(bigtime_t delay, bool includeBorder,
 	fScreenshot(NULL),
 	fOutputPathPanel(NULL),
 	fLastSelectedPath(NULL),
-	fDelay(delay),
+	fDelay(0),
 	fTabHeight(0),
 	fIncludeBorder(includeBorder),
 	fIncludeMouse(includeMouse),
@@ -158,10 +159,13 @@ ScreenshotWindow::ScreenshotWindow(bigtime_t delay, bool includeBorder,
 	fImageFileType(imageFileType)
 {
 	if (fSaveScreenshotSilent) {
-		_TakeScreenshot(fDelay);
+		_TakeScreenshot(delay);
 		_SaveScreenshot();
 		be_app_messenger.SendMessage(B_QUIT_REQUESTED);
 	} else {
+		if (!fShowConfigWindow)
+			_TakeScreenshot(delay);
+		
 		BMessage settings = _ReadSettings();
 		_InitWindow(settings);
 		CenterOnScreen();
@@ -336,7 +340,6 @@ ScreenshotWindow::_InitWindow(const BMessage& settings)
 	_SetupSecondLayoutItem(layout, settings);
 
 	if (!fShowConfigWindow) {
-		_TakeScreenshot(0);
 		_UpdatePreviewPanel();
 		layout->SetVisibleItem(1L);
 		fSaveScreenshot->MakeDefault(true);