From e5ebcbc6343a5d5d815cbbd1812f1f5791b7bc88 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Tue, 4 Sep 2012 15:30:21 +1000 Subject: QWizard/Win: Fix vista helper cache state invalidation If the cached state is not dirty and the instanceCount is zero, when the instanceCount is incremented the cached state will not be correct. To fix this, reset the cached state to dirty if the instanceCount is incremented from zero. Change-Id: Ic49eef7f83b1289a939f998817b1b2b5f5a2a45f Reviewed-by: Friedemann Kleint --- src/widgets/dialogs/qwizard_win.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 7f90efa190..d91ea47aad 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -248,8 +248,9 @@ QVistaHelper::QVistaHelper(QWizard *wizard) , wizard(wizard) , backButton_(0) { - ++instanceCount; is_vista = resolveSymbols(); + if (instanceCount++ == 0) + cachedVistaState = Dirty; if (is_vista) backButton_ = new QVistaBackButton(wizard); -- cgit v1.2.3