OSDN Git Service
(root)
/
peercast-im
/
PeerCastIM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bump時に一瞬GUIの表示がERRORになるのを修正。
[peercast-im/PeerCastIM.git]
/
c:
/
Git
/
PeerCast.root
/
PeerCast
/
ui
/
win32
/
simple
/
gui.cpp
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
(file)
--- 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){
//
\83
X
\83
e
\81
[
\83
^
\83
X
\95
\
\8e
¦
Gdiplus::Image *img = NULL;
unsigned int nowTime = sys->getTime();
//
\83
X
\83
e
\81
[
\83
^
\83
X
\95
\
\8e
¦
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;
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_broad_ok;
break;
case Channel::S_ERROR:
- img = img_error;
+ // bump
\8e
\9e
\82
É
\83
G
\83
\89
\81
[
\82
ª
\95
\
\8e
¦
\82
³
\82
ê
\82
é
\82
Ì
\82
ð
\96
h
\8e
~
+ if (ch && ch->bumped)
+ {
+ img = img_connect;
+ } else
+ {
+ img = img_error;
+ }
break;
default:
img = img_idle;
break;
default:
img = img_idle;
@@
-968,7
+976,7
@@
THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
while(cd){
ServentData *sv = cd->findServentData(s->servent_id);
// ServentData
\82
ª
\82
\82
ê
\82
Î
while(cd){
ServentData *sv = cd->findServentData(s->servent_id);
// ServentData
\82
ª
\82
\82
ê
\82
Î
- if (sv){
+ if (sv
&& cd->getChannelId() == s->channel_id
){
//
\83
f
\81
[
\83
^
\90
Ý
\92
è
sv->setData(s, &hitData, totalListeners, totalRelays, infoFlg);
sv->setEnableFlg(TRUE);
//
\83
f
\81
[
\83
^
\90
Ý
\92
è
sv->setData(s, &hitData, totalListeners, totalRelays, infoFlg);
sv->setEnableFlg(TRUE);