QNX: Move buffer count check to appropriate location

The buffer count check should take place right after buffers are created. For
some reason, the buffer count value inside libscreen may become incosistent during
the course of the program.

cherry-picked from qt5/qtbase 1b95d3331cb43fda36f92189ddce4e4c45bd47ea

Change-Id: Id542b3f8633ce118b0c125d47f3eda63ca31fe5e
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/src/plugins/platforms/blackberry/qbbwindow.cpp b/src/plugins/platforms/blackberry/qbbwindow.cpp
index 284aabf53d..e87febb903 100644
--- a/src/plugins/platforms/blackberry/qbbwindow.cpp
+++ b/src/plugins/platforms/blackberry/qbbwindow.cpp
@@ -319,6 +319,18 @@ void QBBWindow::setBufferSize(const QSize &size)
         if (result != 0) {
             qFatal("QBBWindow: failed to create window buffers, errno=%d", errno);
         }
+
+        // check if there are any buffers available
+        int bufferCount = 0;
+        result = screen_get_window_property_iv(mWindow, SCREEN_PROPERTY_RENDER_BUFFER_COUNT, &bufferCount);
+
+        if (result != 0) {
+            qFatal("QBBWindow: failed to query window buffer count, errno=%d", errno);
+        }
+
+        if (bufferCount != MAX_BUFFER_COUNT) {
+            qFatal("QBBWindow: invalid buffer count. Expected = %d, got = %d", MAX_BUFFER_COUNT, bufferCount);
+        }
     }
 
     // cache new buffer size
@@ -356,22 +368,10 @@ QBBBuffer &QBBWindow::buffer(QBBWindow::Buffer bufferIndex)
 
     // check if render buffer is invalid
     if (mCurrentBufferIndex == -1) {
-        // check if there are any buffers available
-        int bufferCount = 0;
-        int result = screen_get_window_property_iv(mWindow, SCREEN_PROPERTY_RENDER_BUFFER_COUNT, &bufferCount);
-
-        if (result != 0) {
-            qFatal("QBBWindow: failed to query window buffer count, errno=%d", errno);
-        }
-
-        if (bufferCount != MAX_BUFFER_COUNT) {
-            qFatal("QBBWindow: invalid buffer count. Expected = %d, got = %d", MAX_BUFFER_COUNT, bufferCount);
-        }
-
         // get all buffers available for rendering
         errno = 0;
         screen_buffer_t buffers[MAX_BUFFER_COUNT];
-        result = screen_get_window_property_pv(mWindow, SCREEN_PROPERTY_RENDER_BUFFERS, (void **)buffers);
+        const int result = screen_get_window_property_pv(mWindow, SCREEN_PROPERTY_RENDER_BUFFERS, (void **)buffers);
         if (result != 0) {
             qFatal("QBBWindow: failed to query window buffers, errno=%d", errno);
         }