From 4f3736d7b6ce7a1455e2c9e1aba9e2380826231b Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Tue, 26 Aug 2008 22:19:00 +0000 Subject: [PATCH] * show the config job panel, even if no page setup was already performed this avoids to multiple window popup for page settings and job settings * Note: this shows the painting regression introduced with r26665, see task #2534 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27211 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/stylededit/StyledEditWindow.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp index 246e22f81c..26772a6927 100644 --- a/src/apps/stylededit/StyledEditWindow.cpp +++ b/src/apps/stylededit/StyledEditWindow.cpp @@ -1065,19 +1065,15 @@ StyledEditWindow::PageSetup(const char* documentName) void StyledEditWindow::Print(const char* documentName) { - status_t result; - - if (fPrintSettings == NULL) { - result = PageSetup(documentName); - if (result != B_OK) - return; - } - BPrintJob printJob(documentName); - printJob.SetSettings(new BMessage(*fPrintSettings)); - result = printJob.ConfigJob(); - if (result != B_OK) - return; + if (fPrintSettings) + printJob.SetSettings(new BMessage(*fPrintSettings)); + + if (printJob.ConfigJob() != B_OK) + return; + + delete fPrintSettings; + fPrintSettings = printJob.Settings(); // information from printJob BRect printableRect = printJob.PrintableRect();