From 356a74042d51b9d12b892bfdfb2e59322a3f9c73 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Tue, 4 Sep 2012 18:36:26 +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 (cherry picked from commit e5ebcbc6343a5d5d815cbbd1812f1f5791b7bc88) Reviewed-by: Friedemann Kleint --- src/gui/dialogs/qwizard_win.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp index bd4301a..13527b1 100644 --- a/src/gui/dialogs/qwizard_win.cpp +++ b/src/gui/dialogs/qwizard_win.cpp @@ -244,8 +244,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 v0.12