bump中にGUIから切断不能にした

diff --git a/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp b/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
index 90504fb..61e232d 100644 (file)
--- a/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
+++ b/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
@@ -1135,7 +1135,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
                }
 
                // 0.1\95b\81~10\82Å1\95b\91Ò\82¿
-               for(i=0; i<10; i++)
+               for(i=0; i<2; i++)
                {
                        if (!thread->active)
                                break;
@@ -1243,8 +1243,12 @@ void PopupChannelMenu(int channel_id){
                        break;
 
                case 1001:      // \90Ø\92f
-                       c->thread.active = false;
-                       c->thread.finish = true;
+                       // bump\92\86\82Í\90Ø\92f\82µ\82È\82¢
+                       if (!c->bumped)
+                       {
+                               c->thread.active = false;
+                               c->thread.finish = true;
+                       }
                        break;
 
                case 1002:      // \8dÄ\90Ú\91±

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 90504fb..61e232d 100644 (file)
--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
@@ -1135,7 +1135,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
                }
 
                // 0.1\95b\81~10\82Å1\95b\91Ò\82¿
-               for(i=0; i<10; i++)
+               for(i=0; i<2; i++)
                {
                        if (!thread->active)
                                break;
@@ -1243,8 +1243,12 @@ void PopupChannelMenu(int channel_id){
                        break;
 
                case 1001:      // \90Ø\92f
-                       c->thread.active = false;
-                       c->thread.finish = true;
+                       // bump\92\86\82Í\90Ø\92f\82µ\82È\82¢
+                       if (!c->bumped)
+                       {
+                               c->thread.active = false;
+                               c->thread.finish = true;
+                       }
                        break;
 
                case 1002:      // \8dÄ\90Ú\91±