From 769b537b5e1a99fc53aa7296fd2b21dc77a4071c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 16 Aug 2015 20:33:13 +0000
Subject: name conflicts solved

git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IRCG/src/options.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'protocols/IRCG/src/options.cpp')

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 19033eabdc..dff5b71451 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -770,7 +770,7 @@ void CConnectPrefsDlg::OnApply()
 		int j = m_serverCombo.GetCount();
 		if (j != CB_ERR && j != 0) {
 			for (int index2 = 0; index2 < j; index2++) {
-				SERVER_INFO* pData = (SERVER_INFO*)m_serverCombo.GetItemData(index2);
+				pData = (SERVER_INFO*)m_serverCombo.GetItemData(index2);
 				if (pData == NULL || (INT_PTR)pData == CB_ERR)
 					continue;
 
-- 
cgit v1.2.3