From 583a0ab68b0716a1f57a497f3c1ed0a142976a7c Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Thu, 2 Feb 2017 11:34:18 -0500
Subject: [PATCH] Fix graphic selection dialog for certain types

This prevents problems when the ID of the graphic does not correspond to
its position in the graphics selection dialog.
---
 src/scenedit/scen.keydlgs.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/scenedit/scen.keydlgs.cpp b/src/scenedit/scen.keydlgs.cpp
index 2e4090804..2636e92b9 100644
--- a/src/scenedit/scen.keydlgs.cpp
+++ b/src/scenedit/scen.keydlgs.cpp
@@ -229,6 +229,8 @@ pic_num_t choose_graphic(short cur_choice,ePicType g_type,cDialog* parent) {
 			pic_dlg = new cPictChoice(pics, parent);
 			break;
 	}
+	if(!all_pics.empty())
+		cur_choice = std::find(all_pics.begin(), all_pics.end(), cur_choice) - all_pics.begin();
 	if(!pic_dlg) {
 		if(all_pics.size());
 		else if(total_pics > 0) {