2012/01/30 0:13:27

diff --git a/nlite.suo b/nlite.suo
index 0fd8f28..cbb7dd3 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/nlite/nlite.cpp b/nlite/nlite.cpp
index 9fe2b97..69e4790 100644 (file)
--- a/nlite/nlite.cpp
+++ b/nlite/nlite.cpp
@@ -191,7 +191,7 @@ static BOOL InitializeNlite(){
        errMessage += TEXT("\91z\92è\82³\82ê\82Ä\82¢\82È\82¢\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½\81B\83A\83v\83\8a\83P\81[\83V\83\87\83\93\94z\92u\83t\83H\83\8b\83_\82É\8dì\90¬\82³\82ê\82½\83\8d\83O\83t\83@\83C\83\8b\82ð\93n\82µ\82Ä\82à\82ç\82¦\82é\82Æ\8aJ\94­\8eÒ\82ª\94ñ\8fí\82É\8aì\82Ñ\82Ü\82·");
        errMessage += TEXT("\r\n\83G\83\89\81[\83\81\83b\83Z\81[\83W:");
        errMessage += summary;
-       DebugOutW(fileName,function,line,DUMPING__DEBUGER__ | LINEFEAD__DEBUGER__ ,ERRORMODE__DEBUGER__,TEXT("%s"),errMessage);
+       DebugOutW(fileName,function,line,DUMPING__DEBUGER__ | LINEFEAD__DEBUGER__ ,ERRORMODE__DEBUGER__,TEXT("%s"),summary);
        ::MessageBox(NULL,errMessage.c_str(),TEXT("\91z\92è\82³\82ê\82Ä\82¢\82È\82¢\83G\83\89\81["),MB_ICONERROR | MB_OK);
        
 

diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp
index 17b7c61..add5ab7 100644 (file)
--- a/nlite/nlite_mainframe.cpp
+++ b/nlite/nlite_mainframe.cpp
@@ -270,6 +270,8 @@ VOID CNliteMainFrame::ConnectingThread(LPVOID userData){
        self.lvNoCombo.GetEditCtrl().SetReadOnly(TRUE);
        self.subLiveNoComboBox.untilConnectingFlag = TRUE;
        self.EnableWindow(FALSE);
+
+       _endthread();
        return;
 }
 
@@ -278,62 +280,69 @@ BOOL CNliteMainFrame::ConnectNicoLive(LPCTSTR liveNo){
        
 
        _beginthread(CNliteMainFrame::ConnectingThread,0,this);
-       nicoLiveStream.DisConnect();
-       commentView.OnConnect();
        BOOL rslt = FALSE;
+       try {
+               nicoLiveStream.DisConnect();
+               commentView.OnConnect();
+               
        
-       NLIB_RESULT code = nicoLiveStream.Connect(nicoVideoAuth,liveNo,LiveCallBack,&userData);
+               NLIB_RESULT code = nicoLiveStream.Connect(nicoVideoAuth,liveNo,LiveCallBack,&userData);
 
-       //\83G\83\89\81[\83R\81[\83h\8f\88\97\9d
-       switch(code){
+               //\83G\83\89\81[\83R\81[\83h\8f\88\97\9d
+               switch(code){
        
-               //\90³\8fí\8fI\97¹
-       case NLIB_ERR_OK:
+                       //\90³\8fí\8fI\97¹
+               case NLIB_ERR_OK:
 
-               rslt = TRUE;
-               break;
-
-               //\91z\92è\82³\82ê\82½\83G\83\89\81[\83R\81[\83h
-       case NLIB_ERR_COOKIE_FAILED:
-       case NLIB_LIVENO_FAILED_UNDEFEINE:
-       case NLIB_GETPLAYERSTATUS_FAILED_CONNECT:
-       case NLIB_ERR_GETPLAYERSTATUS_INVALID_LV:
-       case NLIB_ERR_GETPLAYERSTATUS_INVALID_THREAD:
-       case NLIB_ERR_GETPLAYERSTATUS_CLOSED:
-       case NLIB_ERR_GETPLAYERSTATUS_UNKNOWN_ERROR:
-       case NLIB_ERR_GETPLAYERSTATUS_SERVER_ERROR:
-       case NLIB_ERR_GETPLAYERSTATUS_DELETED:
-       case NLIB_ERR_GETPLAYERSTATUS_FULL:
-       case NLIB_ERR_GETPLAYERSTATUS_PERMISSION_DENIED:
-       case NLIB_ERR_GETPLAYERSTATUS_ACCESS_LOCKED:
-       case NLIB_ERR_GETPLAYERSTATUS_REQUIRE_COMMUNITY_MEMBER:
-       case NLIB_ERR_GETPLAYERSTATUS_COMINGSOON:
-       case NLIB_ERR_GETPLAYERSTATUS_NOTFOUND:
-       case NLIB_ERR_GETPLAYERSTATUS_NOTLOGIN:
-       case NLIB_ERR_GETPLAYERSTATUS_UNKNOWN:
-       case NLIB_ERR_GETPLAYERSTATUS_MAINTENANCE:
-       case NLIB_ERR_GETPLAYERSTATUS_NOT_PERMITTED:
-       case NLIB_ERR_GETPLAYERSTATUS_REQUIRE_ACCEPT_PRINT_TIMESHIFT_TICKET:
-       case NLIB_ERR_GETPLAYERSTATUS_TSARCHIVE:
-       case NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT:
-       case NLIB_ERR_GETPLAYERSTATUS_UNDEFINED:
-       case NLIB_ERR_GETPLAYERSTATUS_NOAUTH:
-       case NLIB_ERR_GETPLAYERSTATUS_CHANT_PARSE:
-
-               this->subLiveNoComboBox.AgreeInputLvNo();
-               ::MessageBox(NULL,NLIB_GetErrorMessage(code),TEXT("\95ú\91\97\90Ú\91±\83G\83\89\81["),MB_ICONERROR | MB_OK);
-               rslt = FALSE;
-               break;
-
-
-               //\91z\92è\82³\82ê\82Ä\82¢\82È\82¢\83G\83\89\81[\83R\81[\83h
-       default:
+                       rslt = TRUE;
+                       break;
+
+                       //\91z\92è\82³\82ê\82½\83G\83\89\81[\83R\81[\83h
+               case NLIB_ERR_COOKIE_FAILED:
+               case NLIB_LIVENO_FAILED_UNDEFEINE:
+               case NLIB_GETPLAYERSTATUS_FAILED_CONNECT:
+               case NLIB_ERR_GETPLAYERSTATUS_INVALID_LV:
+               case NLIB_ERR_GETPLAYERSTATUS_INVALID_THREAD:
+               case NLIB_ERR_GETPLAYERSTATUS_CLOSED:
+               case NLIB_ERR_GETPLAYERSTATUS_UNKNOWN_ERROR:
+               case NLIB_ERR_GETPLAYERSTATUS_SERVER_ERROR:
+               case NLIB_ERR_GETPLAYERSTATUS_DELETED:
+               case NLIB_ERR_GETPLAYERSTATUS_FULL:
+               case NLIB_ERR_GETPLAYERSTATUS_PERMISSION_DENIED:
+               case NLIB_ERR_GETPLAYERSTATUS_ACCESS_LOCKED:
+               case NLIB_ERR_GETPLAYERSTATUS_REQUIRE_COMMUNITY_MEMBER:
+               case NLIB_ERR_GETPLAYERSTATUS_COMINGSOON:
+               case NLIB_ERR_GETPLAYERSTATUS_NOTFOUND:
+               case NLIB_ERR_GETPLAYERSTATUS_NOTLOGIN:
+               case NLIB_ERR_GETPLAYERSTATUS_UNKNOWN:
+               case NLIB_ERR_GETPLAYERSTATUS_MAINTENANCE:
+               case NLIB_ERR_GETPLAYERSTATUS_NOT_PERMITTED:
+               case NLIB_ERR_GETPLAYERSTATUS_REQUIRE_ACCEPT_PRINT_TIMESHIFT_TICKET:
+               case NLIB_ERR_GETPLAYERSTATUS_TSARCHIVE:
+               case NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT:
+               case NLIB_ERR_GETPLAYERSTATUS_UNDEFINED:
+               case NLIB_ERR_GETPLAYERSTATUS_NOAUTH:
+               case NLIB_ERR_GETPLAYERSTATUS_CHANT_PARSE:
+
+                       this->subLiveNoComboBox.AgreeInputLvNo();
+                       ::MessageBox(NULL,NLIB_GetErrorMessage(code),TEXT("\95ú\91\97\90Ú\91±\83G\83\89\81["),MB_ICONERROR | MB_OK);
+                       rslt = FALSE;
+                       break;
+
+
+                       //\91z\92è\82³\82ê\82Ä\82¢\82È\82¢\83G\83\89\81[\83R\81[\83h
+               default:
                
-               this->subLiveNoComboBox.AgreeInputLvNo();
-               UnexpectedErrorMessageShow( TEXT("\95ú\91\97\90Ú\91±\92\86\82É"),NLIB_GetErrorMessage(code),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__));
-               rslt = FALSE;
+                       this->subLiveNoComboBox.AgreeInputLvNo();
+                       UnexpectedErrorMessageShow( TEXT("\95ú\91\97\90Ú\91±\92\86\82É"),NLIB_GetErrorMessage(code),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__));
+                       rslt = FALSE;
                
-               break;
+                       break;
+
+               }
+       } catch(nlib::Exception &e){
+
+               UnexpectedErrorMessageShow( TEXT("\95ú\91\97\90Ú\91±\92\86\82É"),e.what(),e.getLineNo(),e.getFileName(),e.getFunctionName());
 
        }