[Igarden-commit] Garden/source/Document CDatabasePanel.cp, 1.104.2.3, 1.104.2.4

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/Document
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27012

Modified Files:
      Tag: Release_branch_v1
	CDatabasePanel.cp 
Log Message:
Problem clicking on a picture column when used on multi-year lists

Index: CDatabasePanel.cp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/CDatabasePanel.cp,v
retrieving revision 1.104.2.3
retrieving revision 1.104.2.4
diff -C2 -d -r1.104.2.3 -r1.104.2.4
*** CDatabasePanel.cp	9 Jan 2007 03:36:27 -0000	1.104.2.3
--- CDatabasePanel.cp	10 Jan 2007 03:33:16 -0000	1.104.2.4
***************
*** 3400,3417 ****
  	MaterialRef	*ref;
  	Material	*mat;
  	pictureLoadInfo_t	*info = static_cast<pictureLoadInfo_t*>(parg);
  	
  	PRECONDITION(info != NULL);
  	SourceQuery	query(SourceMaterialFile::GetSourceDatabase());
! 	ref = _rows[info->row]->ref;
! 	if(ref != NULL)
  	{
! 		mat = ref->GetMaterial(ifMissingNULL);
! 		if(mat != NULL)
  		{
! 			String	canon;
! 			canon = mat->GetFullCanonicalName();
! 			query.FindPictures(canon, info->loadAll ? kAllPictures : kInitialPictures);
! 			RebuildRow(info->row, false);
  		}
  	}
--- 3400,3422 ----
  	MaterialRef	*ref;
  	Material	*mat;
+ 	long		row, subRow;
  	pictureLoadInfo_t	*info = static_cast<pictureLoadInfo_t*>(parg);
  	
  	PRECONDITION(info != NULL);
  	SourceQuery	query(SourceMaterialFile::GetSourceDatabase());
! 	_table->ToMultiRow(info->row, row, subRow);
! 	if(row >= 0)
  	{
! 		ref = _rows[row]->ref;
! 		if(ref != NULL)
  		{
! 			mat = ref->GetMaterial(ifMissingNULL);
! 			if(mat != NULL)
! 			{
! 				String	canon;
! 				canon = mat->GetFullCanonicalName();
! 				query.FindPictures(canon, info->loadAll ? kAllPictures : kInitialPictures);
! 				RebuildRow(row, false);
! 			}
  		}
  	}