From d9275913d308193bc610749067cb034310b6510c Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 17 Sep 2018 08:46:28 +0300
Subject: [PATCH] Debugger: Fix crash when starting with expressions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTCREATORBUG-21087
Change-Id: I9d98bb045504d91964f4dd33ad042adba6a128ba
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 src/plugins/debugger/debuggerengine.cpp | 1 +
 src/plugins/debugger/watchhandler.cpp   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 63811b25952..6d3fc399709 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -774,6 +774,7 @@ void DebuggerEnginePrivate::setupViews()
     m_perspective->addWindow(m_logWindow, Perspective::AddToTab, nullptr, false, Qt::TopDockWidgetArea);
 
     m_perspective->select();
+    m_watchHandler.loadSessionDataForEngine();
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 663c9208c63..14ae91dcdd0 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1974,7 +1974,6 @@ WatchHandler::WatchHandler(DebuggerEngine *engine)
     : m_engine(engine)
 {
     m_model = new WatchModel(this, engine);
-    loadSessionDataForEngine();
 }
 
 WatchHandler::~WatchHandler()