diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
| commit | 4a826ada0486dd2c07b3932c6e62ad375f0edfbb (patch) | |
| tree | 39360b652210c9d92506fe0c0170f8e45a91b159 /src/plugins/debugger/watchhandler.cpp | |
| parent | 582c46d34f28f9e04af4d8179f455a603ded5ec7 (diff) | |
| parent | 427bb8c363fc3ee0d9c12ca7ac01d47dc0f6f8f4 (diff) | |
| download | qt-creator-4a826ada0486dd2c07b3932c6e62ad375f0edfbb.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
Diffstat (limited to 'src/plugins/debugger/watchhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/watchhandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 594add236c..aa893b4162 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1256,7 +1256,8 @@ void WatchHandler::cleanup() saveWatchers(); m_model->reinitialize(); emit m_model->updateFinished(); - m_model->m_separatedView->hide(); + if (Internal::mainWindow()) + m_model->m_separatedView->hide(); } static bool sortByName(const TreeItem *a, const TreeItem *b) |