diff options
| author | Dominik Kapusta <dominik.kapusta@teleca.com> | 2010-07-29 13:46:08 +0200 |
|---|---|---|
| committer | Dominik Kapusta <dominik.kapusta@teleca.com> | 2010-07-29 13:56:56 +0200 |
| commit | 38a86893cd184677db9abc6542081b2f21aaf613 (patch) | |
| tree | 1d5dec8f8f39008fa833f46fddd417278f7a124d /src | |
| parent | cb664f3dd4b7d74de61fe47261668b497c6a9e39 (diff) | |
Fixes: NB#178931 - System modal dialog cannot be invoked twice
RevBy: Michał
Details: Guard MSceneWindowPrivate::sceneManager pointer. When the
system modal dialog is closed and it's window is deleted (together with
the scene manager), the pointer is zeroed and upon next call to appear
it will be recognised as invalid pointer and it won't be dereferenced,
especially in MSceneManagerPrivate::addSceneWindow().
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/widgets/mscenewindow_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/widgets/mscenewindow_p.h b/src/corelib/widgets/mscenewindow_p.h index bb6a5257..c9a14726 100644 --- a/src/corelib/widgets/mscenewindow_p.h +++ b/src/corelib/widgets/mscenewindow_p.h @@ -23,7 +23,7 @@ #include "mscenewindow.h" #include "private/mwidgetcontroller_p.h" #include <mabstractwidgetanimation.h> - +#include <MSceneManager> #include <QPointer> class MWindow; @@ -64,7 +64,7 @@ public: MSceneWindowTransition *queuedTransition; // Scene manager that owns this scene window. - MSceneManager *sceneManager; + QPointer<MSceneManager> sceneManager; }; class MSceneWindowTestInterface : public QObject |