From 1359cccb9f84ce578ca4f3464ca58f5e77181a7c Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Tue, 10 Sep 2013 12:52:23 +0200
Subject: [PATCH] Qnx: Don't crash on startup.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id9f41f9ff74bb3d5f0ee91a7a8da0061a437cd2a
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
---
 src/plugins/qnx/blackberryconfigurationmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qnx/blackberryconfigurationmanager.cpp b/src/plugins/qnx/blackberryconfigurationmanager.cpp
index 28314509b41..1f08d03a770 100644
--- a/src/plugins/qnx/blackberryconfigurationmanager.cpp
+++ b/src/plugins/qnx/blackberryconfigurationmanager.cpp
@@ -149,7 +149,7 @@ void BlackBerryConfigurationManager::loadAutoDetectedConfigurations()
 
     // If no target was/is activated, activate one since it's needed by
     // device connection and CSK code.
-    if (activeConfigurations().isEmpty())
+    if (activeConfigurations().isEmpty() && !m_configs.isEmpty())
         m_configs.first()->activate();
 }