Mon Jan 25 19:50:16 CET 2010 Tobias Rautenkranz * Fix with-painter diff -rN -u old-qt.gui/src/painter.lisp new-qt.gui/src/painter.lisp --- old-qt.gui/src/painter.lisp 2014-10-30 07:40:54.000000000 +0100 +++ new-qt.gui/src/painter.lisp 2014-10-30 07:40:54.000000000 +0100 @@ -7,16 +7,16 @@ Makes sure the painter ends after BODY; thus preventing problems with still active and not yet garbage collected painters in CXX:PAINT-EVENT." - (when paint-device - `(let ((,painter (make-instance 'qt:painter :arg0 ,paint-device))) - (assert (cxx:is-active ,painter) - (,painter) - "Painter ~A for ~A is not active" - ,painter ,paint-device) - (unwind-protect - (progn ,@body) - (cxx:end ,painter))) - `(progn (cxx:save ,painter) - (unwind-protect - (progn ,@body) - (cxx:restore ,painter))))) + (if paint-device + `(let ((,painter (make-instance 'qt:painter :arg0 ,paint-device))) + (assert (cxx:is-active ,painter) + (,painter) + "Painter ~A for ~A is not active" + ,painter ,paint-device) + (unwind-protect + (progn ,@body) + (cxx:end ,painter))) + `(progn (cxx:save ,painter) + (unwind-protect + (progn ,@body) + (cxx:restore ,painter)))))