Commit 130f5dae authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

opt.no_jump_on_resort -> opt.jump_on_resort

parent 3aacde47

src/menu.c

+4 −4
Original line number Diff line number Diff line
@@ -1379,25 +1379,25 @@ void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data) 
			break;

		case CB_SORT_FILENAME:

			filelist = gib_list_sort(filelist, feh_cmp_filename);

			if (!opt.no_jump_on_resort) {

			if (opt.jump_on_resort) {

				slideshow_change_image(m->fehwin, SLIDE_FIRST);

			}

			break;

		case CB_SORT_IMAGENAME:

			filelist = gib_list_sort(filelist, feh_cmp_name);

			if (!opt.no_jump_on_resort) {

			if (opt.jump_on_resort) {

				slideshow_change_image(m->fehwin, SLIDE_FIRST);

			}

			break;

		case CB_SORT_FILESIZE:

			filelist = gib_list_sort(filelist, feh_cmp_size);

			if (!opt.no_jump_on_resort) {

			if (opt.jump_on_resort) {

				slideshow_change_image(m->fehwin, SLIDE_FIRST);

			}

			break;

		case CB_SORT_RANDOMIZE:

			filelist = gib_list_randomize(filelist);

			if (!opt.no_jump_on_resort) {

			if (opt.jump_on_resort) {

				slideshow_change_image(m->fehwin, SLIDE_FIRST);

			}

			break;

src/options.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void init_parse_options(int argc, char **argv) 
	opt.no_blur_ctrl_mask = 0;



	opt.start_list_at = NULL;

	opt.no_jump_on_resort = 0;

	opt.jump_on_resort = 1;



	opt.builtin_http = 0;
@@ -722,7 +722,7 @@ static void feh_parse_option_array(int argc, char **argv) 
			opt.actions[9] = estrdup(optarg);

			break;

		case 220:

			opt.no_jump_on_resort = 1;

			opt.jump_on_resort = 0;

			break;

		case 221:

			opt.hide_pointer = 1;

src/options.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct __fehoptions { 
	unsigned char keep_http;

	unsigned char borderless;

	unsigned char randomize;

	unsigned char no_jump_on_resort;

	unsigned char jump_on_resort;

	unsigned char full_screen;

	unsigned char auto_zoom;

	unsigned char draw_filename;