summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-10-18 05:00:22 +0300
committerAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-10-18 05:00:22 +0300
commitd8184273294f50dc1f779e1f140ccb007f952d6d (patch)
tree43bb952f40fe24b4923e75fa8e8b23048e7924f4
parent6f250817b6fa8e3adfa55ef13f20ff6472481db6 (diff)
Changes: Don't crash on a null property cache object in composite window constructor.
Return an allocated but invalid object instead. RevBy: TrustMe
-rw-r--r--src/mcompositewindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mcompositewindow.cpp b/src/mcompositewindow.cpp
index c025834..a56cea3 100644
--- a/src/mcompositewindow.cpp
+++ b/src/mcompositewindow.cpp
@@ -58,7 +58,7 @@ MCompositeWindow::MCompositeWindow(Qt::HANDLE window,
win_id(window)
{
thumb_mode = false;
- if (!mpc->is_valid) {
+ if (!mpc || (mpc && !mpc->is_valid)) {
is_valid = false;
pc = 0;
anim = 0;