X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=c%3A%2FGit%2FPeerCast.root%2FPeerCast%2Fui%2Fwin32%2Fsimple%2Fgui.cpp;h=82e6e0f1930422965b6dfe5cd520bc2c1f6e3978;hb=2910aa6228ef8c81043b0a27b1fdd7dc5885d258;hp=d1768b719b080fbeb61c5f2c7ac5558618f18048;hpb=62695e1a2c94c9dbf6be2fbfd60656b5726cac52;p=peercast-im%2FPeerCastIM.git

diff --git a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
index d1768b7..82e6e0f 100644
--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
@@ -366,6 +366,7 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
 	// ƒXƒe[ƒ^ƒX•\Ž¦
 	Gdiplus::Image *img = NULL;
 	unsigned int nowTime = sys->getTime();
+	Channel *ch = chanMgr->findChannelByChannelID(this->channel_id);
 	switch(this->getStatus()){
 		case Channel::S_IDLE:
 			img = img_idle;
@@ -401,7 +402,14 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
 			img = img_broad_ok;
 			break;
 		case Channel::S_ERROR:
-			img = img_error;
+			// bumpŽž‚ɃGƒ‰[‚ª•\Ž¦‚³‚ê‚é‚Ì‚ð–hŽ~
+			if (ch && ch->bumped)
+			{
+				img = img_connect;
+			} else
+			{
+				img = img_error;
+			}
 			break;
 		default:
 			img = img_idle;
@@ -968,7 +976,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
 				while(cd){
 					ServentData *sv = cd->findServentData(s->servent_id);
 					// ServentData‚ª‚ ‚ê‚Î
-					if (sv){
+					if (sv && cd->getChannelId() == s->channel_id){
 						// ƒf[ƒ^Ý’è
 						sv->setData(s, &hitData, totalListeners, totalRelays, infoFlg);
 						sv->setEnableFlg(TRUE);