From e7fe0f67d172012271b5aa1656467b312b8aa37c Mon Sep 17 00:00:00 2001 From: "Ithamar R. Adema" Date: Sun, 13 Jan 2008 23:47:35 +0000 Subject: [PATCH] Fix BPrintJob to not screw up user-made job settings with the global defaults.... StyledEdit prints again :) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23506 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/PrintJob.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/kits/interface/PrintJob.cpp b/src/kits/interface/PrintJob.cpp index 6d1cf2d127..8fed40e2a5 100644 --- a/src/kits/interface/PrintJob.cpp +++ b/src/kits/interface/PrintJob.cpp @@ -797,9 +797,11 @@ BPrintJob::_LoadDefaultSettings() BMessage *reply = new BMessage; printServer.SendMessage(&message, reply); - - _HandlePrintSetup(reply); - + + // Only override our settings if we don't have any settings yet + if (fSetupMessage == NULL) + _HandlePrintSetup(reply); + delete fDefaultSetupMessage; fDefaultSetupMessage = reply; }