diff options
author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-04-15 10:34:16 (GMT) |
---|---|---|
committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-04-15 11:29:03 (GMT) |
commit | 0d80dbc176afa997af7d897344e5a8bfec0317dc (patch) | |
tree | df8002ccf8908ee7e56bad4fcff865b0381f4563 /src/gui/dialogs | |
parent | e4282111378ce67a1ae9c235efbd89b327f1bb91 (diff) | |
download | Qt-0d80dbc176afa997af7d897344e5a8bfec0317dc.zip Qt-0d80dbc176afa997af7d897344e5a8bfec0317dc.tar.gz Qt-0d80dbc176afa997af7d897344e5a8bfec0317dc.tar.bz2 |
Crash while printing from the portedcanvas example on Mac Cocoa.
The PMPrintSession inside the NSPrintInfo can get changed by the
NSPageLayout. Refresh the session pointer saved in the
QMacPrintEnginePrivate after showing the page setup dialog.
Task-number: QTBUG-9880
Reviewed-by: Trond
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r-- | src/gui/dialogs/qpagesetupdialog_mac.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/dialogs/qpagesetupdialog_mac.mm b/src/gui/dialogs/qpagesetupdialog_mac.mm index 13ffa05..cfcde0f 100644 --- a/src/gui/dialogs/qpagesetupdialog_mac.mm +++ b/src/gui/dialogs/qpagesetupdialog_mac.mm @@ -232,6 +232,11 @@ void QPageSetupDialogPrivate::openCocoaPageLayout(Qt::WindowModality modality) void QPageSetupDialogPrivate::closeCocoaPageLayout() { + // NSPageLayout can change the session behind our back and then our + // d->ep->session object will become a dangling pointer. Update it + // based on the "current" session + ep->session = static_cast<PMPrintSession>([ep->printInfo PMPrintSession]); + [pageLayout release]; pageLayout = 0; } |