Debugger: "Reset to default layout" resets both QML and QML/CPP layout

Change-Id: Ia2d0de65d772826697ec51e6f82dc0e3fe36e05b
Reviewed-by: hjk <qthjk@ovi.com>

diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 5248650..5186f9c 100644 (file)
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -573,13 +573,14 @@ void DebuggerMainWindow::readSettings()
 
 void DebuggerMainWindowPrivate::resetDebuggerLayout()
 {
+    m_activeDebugLanguages = DebuggerLanguage(QmlLanguage | CppLanguage);
     setSimpleDockWidgetArrangement();
+    m_dockWidgetActiveStateQmlCpp = q->saveSettings();
 
-    if (isQmlActive())
-        m_dockWidgetActiveStateQmlCpp = q->saveSettings();
-    else
-        m_dockWidgetActiveStateCpp = q->saveSettings();
-
+    m_activeDebugLanguages = CppLanguage;
+    m_previousDebugLanguages = CppLanguage;
+    setSimpleDockWidgetArrangement();
+    // will save state in m_dockWidgetActiveStateCpp
     updateActiveLanguages();
 }