Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch Screenshot to not ignore the delay time setting from the command line. This fixes ticket #5862

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36969 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Wim van der Meer 2010-05-29 12:12:07 +00:00
parent 598a6d8517
commit 953aaafc13
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/apps/screenshot/ScreenshotWindow.cpp
View File

@ -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);