user Layouts::Manager for currentLayoutName

5 years ago · 4f92222863
parent 92c0a68a19
commit 4f92222863
2 changed files with 2 additions and 2 deletions
--- a/app/settings/controllers/layoutscontroller.cpp
+++ b/app/settings/controllers/layoutscontroller.cpp
@ -161,7 +161,7 @@ bool Layouts::selectedLayoutIsCurrentActive() const
    Settings::Data::Layout selectedLayoutOriginal = selectedLayoutOriginalData();
    selectedLayoutOriginal = selectedLayoutOriginal.isEmpty() ? selectedLayoutCurrent : selectedLayoutOriginal;

-    return (selectedLayoutCurrent.isActive && (selectedLayoutOriginal.name == m_corona->layoutsManager()->synchronizer()->currentLayoutName()));
+    return (selectedLayoutCurrent.isActive && (selectedLayoutOriginal.name == m_corona->layoutsManager()->currentLayoutName()));
 }

 const Data::Layout Layouts::selectedLayoutCurrentData() const
--- a/app/settings/models/layoutsmodel.cpp
+++ b/app/settings/models/layoutsmodel.cpp
@ -836,7 +836,7 @@ void Layouts::updateActiveStates()
        bool iActive{false};

        if (m_inMultipleMode && m_corona->layoutsManager()->synchronizer()->layout(m_layoutsTable[i].name)
-                || (!m_inMultipleMode && o_layoutsTable[i].name == m_corona->layoutsManager()->synchronizer()->currentLayoutName())) {
+                || (!m_inMultipleMode && o_layoutsTable[i].name == m_corona->layoutsManager()->currentLayoutName())) {
            iActive = true;
        }