1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't release the printer after using it to change a property

Browse Source 
The printer should not be released after changing a property on it as it
is still needed by QPrinter elsewhere. It is released as appropriate
automatically already.

Task-number: QTBUG-32831

Change-Id: Idb2d98b25b62f343015a0a0fb3c9a0d506546132
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
This commit is contained in:
Andy Shaw 2013-08-08 11:05:26 +02:00 committed by The Qt Project
parent feacbdb746
commit 3e078cf36d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/cocoa/qprintengine_mac.mm
View File

@ -187,10 +187,8 @@ void QMacPrintEnginePrivate::setPaperName(const QString &name)
if (PMSessionGetCurrentPrinter(session(), &printer) == noErr) { if (PMSessionGetCurrentPrinter(session(), &printer) == noErr) {
CFArrayRef array; CFArrayRef array;
if (PMPrinterGetPaperList(printer, &array) != noErr) { if (PMPrinterGetPaperList(printer, &array) != noErr)
PMRelease(printer);
return; return;
}
int count = CFArrayGetCount(array); int count = CFArrayGetCount(array);
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
PMPaper paper = static_cast<PMPaper>(const_cast<void *>(CFArrayGetValueAtIndex(array, i))); PMPaper paper = static_cast<PMPaper>(const_cast<void *>(CFArrayGetValueAtIndex(array, i)));
@ -208,7 +206,6 @@ void QMacPrintEnginePrivate::setPaperName(const QString &name)
} }
} }
} }
PMRelease(printer);
} }
} }