[commit] r2223 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed May 29 15:21:40 2013
New Revision: 2223

Log:
Follow COM rules

Modified:
   trunk/GME/Mga/MgaAttribute.cpp

Modified: trunk/GME/Mga/MgaAttribute.cpp
==============================================================================
--- trunk/GME/Mga/MgaAttribute.cpp	Wed May 29 15:21:27 2013	(r2222)
+++ trunk/GME/Mga/MgaAttribute.cpp	Wed May 29 15:21:40 2013	(r2223)
@@ -907,7 +907,9 @@
 		COMTRY {
 			fco->CheckRead();
 			CComBSTR vval;
-			if(icon) COMTHROW(get_RegistryValue(CComBSTR(L"Icon"), icon));
+			_bstr_t regValueIcon;
+			if (icon)
+				regValueIcon = RegistryValue[L"Icon"];
 			if(x || y) {
 				CComBSTR bb;
 				COMTHROW(get_RegistryValue(CComBSTR(L"Position"), &bb));
@@ -915,6 +917,8 @@
 				if(!bb) { *lx = -1; *ly = -1;  }
 				else if(swscanf(bb,OLESTR("%ld,%ld"), lx, ly) != 2) COMTHROW(E_MGA_BAD_POSITIONVALUE);
 			}
+			if (icon)
+				*icon = regValueIcon.Detach();
 		} COMCATCH(;)
 }