[Mvpmc-cvs] mvpmc/src mythtv.c,1.86,1.87

[Jon G. <ge...@us...>]

Update of /cvsroot/mvpmc/mvpmc/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27234/src

Modified Files:
	mythtv.c 
Log Message:
Fix a bug where it would go to the wrong myth menu after
deleting a recording if the menus were sorted by category
or recording group.


Index: mythtv.c
===================================================================
RCS file: /cvsroot/mvpmc/mvpmc/src/mythtv.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** mythtv.c	24 Dec 2005 16:15:50 -0000	1.86
--- mythtv.c	31 Dec 2005 15:12:37 -0000	1.87
***************
*** 706,710 ****
  	for (i = 0; i < count; ++i) {
  		prog = cmyth_proglist_get_item(ep_list, i);
! 		t = cmyth_proginfo_title(prog);
  		cmyth_release(prog);
  		if (strcmp(title, t) == 0) {
--- 706,723 ----
  	for (i = 0; i < count; ++i) {
  		prog = cmyth_proglist_get_item(ep_list, i);
! 		switch (show_sort) {
! 		case SHOW_TITLE:
! 			t = cmyth_proginfo_title(prog);
! 			break;
! 		case SHOW_CATEGORY:
! 			t = cmyth_proginfo_category(prog);
! 			break;
! 		case SHOW_RECGROUP:
! 			t = cmyth_proginfo_recgroup(prog);
! 			break;
! 		default:
! 			t = NULL;
! 			break;
! 		}
  		cmyth_release(prog);
  		if (strcmp(title, t) == 0) {
***************
*** 837,841 ****
  		} else if ((strcmp(prog, "All - Oldest first") == 0) ||
  			   ((name != title) && (strcmp(name, prog) == 0))) {
! 			list_all = 1;
  			snprintf(full, sizeof(full), "%s - %s",
  				 title, subtitle);
--- 850,857 ----
  		} else if ((strcmp(prog, "All - Oldest first") == 0) ||
  			   ((name != title) && (strcmp(name, prog) == 0))) {
! 			if (strcmp(prog, "All - Oldest first") == 0)
! 				list_all = 1;
! 			else
! 				list_all = 0;
  			snprintf(full, sizeof(full), "%s - %s",
  				 title, subtitle);
***************
*** 963,967 ****
  		int count;
  
! 		title=cmyth_proginfo_title(hi_prog);
  		cmyth_release(hi_prog);
  		if (!list_all)
--- 979,993 ----
  		int count;
  
! 		switch (show_sort) {
! 		case SHOW_TITLE:
! 			title=cmyth_proginfo_title(hi_prog);
! 			break;
! 		case SHOW_CATEGORY:
! 			title=cmyth_proginfo_category(hi_prog);
! 			break;
! 		case SHOW_RECGROUP:
! 			title=cmyth_proginfo_recgroup(hi_prog);
! 			break;
! 		}
  		cmyth_release(hi_prog);
  		if (!list_all)