[commit] r1383 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Jun 27 15:24:55 2011
New Revision: 1383

Log:
Fix "Remember this decision" for Attribute Ignore

Modified:
   trunk/GME/MgaUtil/ClosureDlg.cpp
   trunk/GME/MgaUtil/DialogList.cpp
   trunk/GME/MgaUtil/MgaResolver.cpp

Modified: trunk/GME/MgaUtil/ClosureDlg.cpp
==============================================================================
--- trunk/GME/MgaUtil/ClosureDlg.cpp	Thu Jun 23 17:35:52 2011	(r1382)
+++ trunk/GME/MgaUtil/ClosureDlg.cpp	Mon Jun 27 15:24:55 2011	(r1383)
@@ -153,7 +153,7 @@
 	if( m_iMarkVal != -1)
 	{
 		TCHAR buf[12];
-		_stprintf( buf, _T("%i"), m_iMarkVal);
+		_stprintf_s( buf, _T("%i"), m_iMarkVal);
 		m_ctrlMarkVal.SetWindowText( buf);
 	}
 

Modified: trunk/GME/MgaUtil/DialogList.cpp
==============================================================================
--- trunk/GME/MgaUtil/DialogList.cpp	Thu Jun 23 17:35:52 2011	(r1382)
+++ trunk/GME/MgaUtil/DialogList.cpp	Mon Jun 27 15:24:55 2011	(r1383)
@@ -96,6 +96,7 @@
 
 void CDialogList::OnButtonIgnore() 
 {
+	UpdateData(TRUE);
     EndDialog( IDIGNORE );
 }
 

Modified: trunk/GME/MgaUtil/MgaResolver.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaResolver.cpp	Thu Jun 23 17:35:52 2011	(r1382)
+++ trunk/GME/MgaUtil/MgaResolver.cpp	Mon Jun 27 15:24:55 2011	(r1383)
@@ -1143,6 +1143,8 @@
 
 		COMTHROW( parent->get_Meta(&parent_metafco) );
 		ASSERT( parent_metafco != NULL );
+		_bstr_t kindName;
+		COMTHROW(parent_metafco->get_Name(kindName.GetAddress()));
 
 		COMTHROW( 
 			((hr = parent_metafco->get_AttributeByName(kind, &imma)) == E_NOTFOUND) ?
@@ -1191,7 +1193,7 @@
 
 				CComPtr<IMgaMetaAttribute> imma_ix;
 				CString sz_dialog_name;
-				sz_dialog_name.Format(_T("Resolve Attribute Kind (for %s):"),kind);
+				sz_dialog_name.Format(_T("Resolve Attribute '%s' for Kind '%s':"), kind, static_cast<BSTR>(kindName));
 				CDialogList cdl( sz_dialog_name, CDialogList::CHKTEXT_ONETIMER, true );
 
 				MGACOLL_ITERATE(IMgaMetaAttribute, mattrs) {
@@ -1211,6 +1213,8 @@
                 if( dlgres == IDIGNORE )
                 {
                     *p = NULL;
+					if (cdl.mb_check_once == TRUE)
+						map_put_AttrByStr(parent_metafco.p, kind, NULL);
                     return S_OK;
                 }
                 else if( dlgres == IDCANCEL )