updates for layouts model single mode

app/layouts/synchronizer.cpp

@@ -498,10 +498,6 @@ void Synchronizer::unloadLayouts()
 
 bool Synchronizer::switchToLayout(QString layoutName, int previousMemoryUsage)
 {
-    if (m_centralLayouts.size() > 0 && previousMemoryUsage == -1) {
-        return false;
-    }
-
     qDebug() << " >>>>> SWITCHING >> " << layoutName << " __ " << previousMemoryUsage;
 
     //! First Check If that Layout is already present and in that case
@@ -535,7 +531,7 @@ bool Synchronizer::switchToLayout(QString layoutName, int previousMemoryUsage)
     QString lPath = layoutPath(layoutName);
 
     if ((m_manager->memoryUsage() == MemoryUsage::SingleLayout && !lPath.isEmpty()) || m_manager->memoryUsage() == MemoryUsage::MultipleLayouts) {
-        if (m_manager->memoryUsage() == MemoryUsage::SingleLayout) {
+        if (m_manager->memoryUsage() == MemoryUsage::SingleLayout && m_centralLayouts.size()>0) {
             emit currentLayoutIsSwitching(m_centralLayouts[0]->name());
         } else if (m_manager->memoryUsage() == MemoryUsage::MultipleLayouts && layoutName != Layout::MULTIPLELAYOUTSHIDDENNAME) {
             //! do nothing

app/settings/models/layoutsmodel.cpp

@@ -358,7 +358,7 @@ QList<Latte::Data::LayoutIcon> Layouts::iconsForCentralLayout(const int &row) co
             }
         }
     } else {
-        if (m_layoutsTable[row].isActive) {
+        if (o_layoutsTable.containsId(m_layoutsTable[row].id) && o_layoutsTable[m_layoutsTable[row].id].name == m_corona->universalSettings()->currentLayoutName()) {
             Latte::Data::LayoutIcon icon;
             icon.name = m_activitiesMap[Latte::Data::Layout::ALLACTIVITIESID].icon;
             icon.isBackgroundFile = false;
@@ -426,7 +426,7 @@ QString Layouts::sortingPriority(const SortingPriority &priority, const int &row
 {
     int iPriority = (int)priority;
 
-    iPriority = (m_layoutsTable[row].isActive ? iPriority - 1000 : iPriority);
+    iPriority = (m_layoutsTable[row].isActive && inMultipleMode() ? iPriority - 1000 : iPriority);
 
     return sortableText(iPriority, row);
 }