aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickthreadedwindowmanager.cpp
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-01-09 09:16:24 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-01-09 09:16:51 +0100
commit7830710e57cbbbc8a2fb37fc97eb99f552ecdd83 (patch)
tree3fe141b7921ec3820c1db13fe1827c051e8f5060 /src/quick/items/qquickthreadedwindowmanager.cpp
parent0beb478b7f4c50f6b57cdc164ffe8029d2895149 (diff)
parentd37547add0369d45182271754c0a35032d7de2d3 (diff)
Merge branch 'stable' into release
Diffstat (limited to 'src/quick/items/qquickthreadedwindowmanager.cpp')
-rw-r--r--src/quick/items/qquickthreadedwindowmanager.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquickthreadedwindowmanager.cpp b/src/quick/items/qquickthreadedwindowmanager.cpp
index 4c38686298..63e2c46d79 100644
--- a/src/quick/items/qquickthreadedwindowmanager.cpp
+++ b/src/quick/items/qquickthreadedwindowmanager.cpp
@@ -845,6 +845,9 @@ QImage QQuickRenderThreadSingleContextWindowManager::grab(QQuickWindow *window)
if (QThread::currentThread() != qApp->thread()) {
qWarning("QQuickWindow::grabFrameBuffer: can only be called from the GUI thread");
return QImage();
+ } else if (window->size().width() <= 0 || window->size().height() <= 0 ) {
+ qWarning("QQuickWindow::grabFrameBuffer: Can't grab a Window with size %dx%d", window->size().width(), window->size().height());
+ return QImage();
}
#ifdef THREAD_DEBUG