Merge pull request #226 from walkero-gr/fixing-list-load-when-sidebar-is-not-enabled

Fixing list load when sidebar is not enabled

Author: walkero-gr

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 - Fixed the generated genre list titles after a rescan of the repository
 - Fixed more memory leaks
+- Fixed the load of the list of items when the side panel is hidden
 
 ## iGame 2.4.3 - [2023-09-01]
 ### Fixed

src/funcs.c

@@ -372,8 +372,15 @@ void app_start(void)
 	set(app->WI_MainWindow, MUIA_Window_Sleep, TRUE);
 	slavesListLoadFromCSV(csvFilename);
 
-	populateGenresList();
-	populateChipsetList();
+	if (!current_settings->hide_side_panel)
+	{
+		populateGenresList();
+		populateChipsetList();
+	}
+	if (current_settings->hide_side_panel)
+	{
+		filter_change();
+	}
 	set(app->WI_MainWindow, MUIA_Window_Sleep, FALSE);
 	set(app->WI_MainWindow, MUIA_Window_ActiveObject, app->LV_GamesList);
 }
@@ -391,27 +398,30 @@ void filter_change(void)
 		return;
 	}
 
-	DoMethod(app->LV_GenresList, MUIM_List_GetEntry,
-		MUIV_List_GetEntry_Active, &genreSelection);
-
 	if (title && strlen(title) > 0)
 	{
 		string_to_lower(title);
 		strncpy(filters.title, title, sizeof(filters.title));
 	}
 	else filters.title[0] = '\0';
 
-	if (genreSelection)
-		strncpy(filters.showGenre, genreSelection, sizeof(filters.showGenre));
+	if (!current_settings->hide_side_panel)
+	{
+		DoMethod(app->LV_GenresList, MUIM_List_GetEntry,
+			MUIV_List_GetEntry_Active, &genreSelection);
+
+		if (genreSelection)
+			strncpy(filters.showGenre, genreSelection, sizeof(filters.showGenre));
 
-	if (!genreSelection || !strcmp(genreSelection, GetMBString(MSG_FilterShowAll)))
-		filters.showGenre[0] = '\0';
+		if (!genreSelection || !strcmp(genreSelection, GetMBString(MSG_FilterShowAll)))
+			filters.showGenre[0] = '\0';
 
-	// Get selected chipset from the cycle box
-	int chipsetIndex = get_cycle_index(app->CY_ChipsetList);
-	strncpy(filters.showChipset, app->CY_ChipsetListContent[chipsetIndex], sizeof(filters.showChipset));
-	if (chipsetIndex == 0)
-		filters.showChipset[0] = '\0';
+		// Get selected chipset from the cycle box
+		int chipsetIndex = get_cycle_index(app->CY_ChipsetList);
+		strncpy(filters.showChipset, app->CY_ChipsetListContent[chipsetIndex], sizeof(filters.showChipset));
+		if (chipsetIndex == 0)
+			filters.showChipset[0] = '\0';
+	}
 
 	showSlavesList();
 }
@@ -628,7 +638,7 @@ static void showSlavesList(void)
 				goto nextItem;
 			}
 
-			// Decide from where the item name will be taken
+			// Decide where the item name will be taken from
 			if(!isStringEmpty(currPtr->user_title))
 			{
 				snprintf(buf, bufSize, "%s", currPtr->user_title);

src/iGameGUI.c

@@ -548,6 +548,11 @@ MakeStaticHook(SettingUseIgameDataTitleHook, settingUseIgameDataTitleChanged);
 		MUIA_NListview_Vert_ScrollBar,  MUIV_NListview_VSB_FullAuto,
 		End;
 
+	object->CY_FilterList = CycleObject,
+		MUIA_HelpNode, "CY_FilterList",
+		MUIA_Frame, MUIV_Frame_Button,
+		MUIA_Cycle_Entries, object->CY_FilterListContent,
+		End;
 
 	if (!current_settings->hide_side_panel)
 	{
@@ -579,12 +584,6 @@ MakeStaticHook(SettingUseIgameDataTitleHook, settingUseIgameDataTitleChanged);
 
 		object->Space_Sidepanel = VSpace(1);
 
-		object->CY_FilterList = CycleObject,
-			MUIA_HelpNode, "CY_FilterList",
-			MUIA_Frame, MUIV_Frame_Button,
-			MUIA_Cycle_Entries, object->CY_FilterListContent,
-			End;
-
 		object->CY_ChipsetList = CycleObject,
 			MUIA_HelpNode, "CY_ChipsetList",
 			MUIA_Frame, MUIV_Frame_Button,
@@ -644,6 +643,7 @@ MakeStaticHook(SettingUseIgameDataTitleHook, settingUseIgameDataTitleChanged);
 	{
 		GR_main = GroupObject,
 			MUIA_HelpNode, "GR_main",
+			Child, object->CY_FilterList,
 			Child, object->LV_GamesList,
 			End;
 	}