Prevent incrementing preset changing current full expansion (#449)

* Prevent incrementing preset changing current full expansion

* Use FullInstrumentExpansion::isEnabled

hi_core/hi_core/UserPresetHandler.cpp

@@ -707,7 +707,7 @@ void MainController::UserPresetHandler::incPreset(bool next, bool stayInSameDire
             PresetBrowser::DataBaseHelpers::cleanFileList(mc, allPresets);
 			allPresets.sort();
 		}
-		else if(mc->getExpansionHandler().getNumExpansions() > 0)
+		else if(!FullInstrumentExpansion::isEnabled(mc) && mc->getExpansionHandler().getNumExpansions() > 0)
 		{
 			for(int i = 0; i < mc->getExpansionHandler().getNumExpansions(); i++)
 			{
@@ -739,24 +739,26 @@ void MainController::UserPresetHandler::incPreset(bool next, bool stayInSameDire
 		}
 	}
 
-	if(currentlyLoadedFile.isAChildOf(expFolder))
+	if (!FullInstrumentExpansion::isEnabled(mc))
 	{
-		for(int i = 0; i < mc->getExpansionHandler().getNumExpansions(); i++)
+		if(currentlyLoadedFile.isAChildOf(expFolder))
 		{
-			auto e = mc->getExpansionHandler().getExpansion(i);
-
-			if(currentlyLoadedFile.isAChildOf(e->getRootFolder()))
+			for(int i = 0; i < mc->getExpansionHandler().getNumExpansions(); i++)
 			{
-				mc->getExpansionHandler().setCurrentExpansion(e, sendNotificationAsync);
-				break;
+				auto e = mc->getExpansionHandler().getExpansion(i);
+
+				if(currentlyLoadedFile.isAChildOf(e->getRootFolder()))
+				{
+					mc->getExpansionHandler().setCurrentExpansion(e, sendNotificationAsync);
+					break;
+				}
 			}
 		}
+		else if (wasExpansionPreset)
+		{
+			mc->getExpansionHandler().setCurrentExpansion(nullptr, sendNotificationAsync);
+		}	
 	}
-	else if (wasExpansionPreset)
-	{
-		mc->getExpansionHandler().setCurrentExpansion(nullptr, sendNotificationAsync);
-	}
-
 
 	loadUserPreset(currentlyLoadedFile);
 }