| Revisión | 1700d3615bb8531268eaa9c119ec27f581e8b312 (tree) |
|---|---|
| Tiempo | 2009-09-29 01:02:22 |
| Autor | eru <eru01@user...> |
| Commiter | eru |
bump中にGUIから切断不能にした
PeerCast.root/PeerCast/ui/win32/simple/gui.cpp (diff) c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp (diff)| @@ -1135,7 +1135,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){ | ||
| 1135 | 1135 | } |
| 1136 | 1136 | |
| 1137 | 1137 | // 0.1秒×10で1秒待ち |
| 1138 | - for(i=0; i<10; i++) | |
| 1138 | + for(i=0; i<2; i++) | |
| 1139 | 1139 | { |
| 1140 | 1140 | if (!thread->active) |
| 1141 | 1141 | break; |
| @@ -1243,8 +1243,12 @@ void PopupChannelMenu(int channel_id){ | ||
| 1243 | 1243 | break; |
| 1244 | 1244 | |
| 1245 | 1245 | case 1001: // 切断 |
| 1246 | - c->thread.active = false; | |
| 1247 | - c->thread.finish = true; | |
| 1246 | + // bump中は切断しない | |
| 1247 | + if (!c->bumped) | |
| 1248 | + { | |
| 1249 | + c->thread.active = false; | |
| 1250 | + c->thread.finish = true; | |
| 1251 | + } | |
| 1248 | 1252 | break; |
| 1249 | 1253 | |
| 1250 | 1254 | case 1002: // 再接続 |
| @@ -1135,7 +1135,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){ | ||
| 1135 | 1135 | } |
| 1136 | 1136 | |
| 1137 | 1137 | // 0.1秒×10で1秒待ち |
| 1138 | - for(i=0; i<10; i++) | |
| 1138 | + for(i=0; i<2; i++) | |
| 1139 | 1139 | { |
| 1140 | 1140 | if (!thread->active) |
| 1141 | 1141 | break; |
| @@ -1243,8 +1243,12 @@ void PopupChannelMenu(int channel_id){ | ||
| 1243 | 1243 | break; |
| 1244 | 1244 | |
| 1245 | 1245 | case 1001: // 切断 |
| 1246 | - c->thread.active = false; | |
| 1247 | - c->thread.finish = true; | |
| 1246 | + // bump中は切断しない | |
| 1247 | + if (!c->bumped) | |
| 1248 | + { | |
| 1249 | + c->thread.active = false; | |
| 1250 | + c->thread.finish = true; | |
| 1251 | + } | |
| 1248 | 1252 | break; |
| 1249 | 1253 | |
| 1250 | 1254 | case 1002: // 再接続 |
Fork