diff src/layout_image.c @ 1623:66d4bd637fd7

use layout_set_fd() for changing images from a slideshow - this updates folder and icon in recursive slideshow mode preserve slideshow on layout change - fixes https://sourceforge.net/tracker/?func=detail&aid=1998513&group_id=222125&atid=1054680

--- a/src/layout_image.c	Thu Jun 04 19:51:20 2009 +0000
+++ b/src/layout_image.c	Thu Jun 04 21:07:03 2009 +0000
@@ -65,11 +65,6 @@
 	/* restore image window */
 	lw->image = fs->normal_imd;
 
-	if (lw->slideshow)
-		{
-		lw->slideshow->imd = lw->image;
-		}
-
 	lw->full_screen = NULL;
 }
 
@@ -85,11 +80,6 @@
 	/* set to new image window */
 	lw->image = lw->full_screen->imd;
 
-	if (lw->slideshow)
-		{
-		lw->slideshow->imd = lw->image;
-		}
-
 	layout_image_set_buttons(lw);
 
 	g_signal_connect(G_OBJECT(lw->full_screen->window), "key_press_event",
@@ -176,12 +166,12 @@
 
 	if (cd && info)
 		{
-		lw->slideshow = slideshow_start_from_collection(lw->image, cd,
+		lw->slideshow = slideshow_start_from_collection(lw, NULL, cd,
 				layout_image_slideshow_stop_func, lw, info);
 		}
 	else
 		{
-		lw->slideshow = slideshow_start(lw->image, lw,
+		lw->slideshow = slideshow_start(lw,
 				layout_list_get_index(lw, layout_image_get_fd(lw)),
 				layout_image_slideshow_stop_func, lw);
 		}
@@ -200,7 +190,7 @@
 		return;
 		}
 
-	lw->slideshow = slideshow_start_from_filelist(lw->image, list,
+	lw->slideshow = slideshow_start_from_filelist(lw, NULL, list,
 						       layout_image_slideshow_stop_func, lw);
 
 	layout_status_update_info(lw, NULL);