From: qwerty2501 <riot313@gmail.com>
Date: Sun, 29 Jan 2012 15:13:27 +0000 (+0900)
Subject: 2012/01/30 0:13:27
X-Git-Tag: v0.002~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a38da6a144a49c120a7cc495a0c6a366196c09bc;p=nlite%2Fnlite.git

2012/01/30 0:13:27
---

diff --git a/nlite.suo b/nlite.suo
index 0fd8f28..cbb7dd3 100644
Binary files a/nlite.suo and b/nlite.suo differ
diff --git a/nlite/nlite.cpp b/nlite/nlite.cpp
index 9fe2b97..69e4790 100644
--- a/nlite/nlite.cpp
+++ b/nlite/nlite.cpp
@@ -191,7 +191,7 @@ static BOOL InitializeNlite(){
 	errMessage += TEXT("‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½BƒAƒvƒŠƒP[ƒVƒ‡ƒ“”z’uƒtƒHƒ‹ƒ_‚ɍ쐬‚³‚ꂽƒƒOƒtƒ@ƒCƒ‹‚ð“n‚µ‚Ä‚à‚炦‚é‚ÆŠJ”­ŽÒ‚ª”ñí‚ÉŠì‚Ñ‚Ü‚·");
 	errMessage += TEXT("\r\nƒGƒ‰[ƒƒbƒZ[ƒW:");
 	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("‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰["),MB_ICONERROR | MB_OK);
 	
 
diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp
index 17b7c61..add5ab7 100644
--- 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);
 
-	//ƒGƒ‰[ƒR[ƒhˆ—
-	switch(code){
+		//ƒGƒ‰[ƒR[ƒhˆ—
+		switch(code){
 	
-		//³íI—¹
-	case NLIB_ERR_OK:
+			//³íI—¹
+		case NLIB_ERR_OK:
 
-		rslt = TRUE;
-		break;
-
-		//‘z’肳‚ꂽƒGƒ‰[ƒR[ƒh
-	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("•ú‘—Ú‘±ƒGƒ‰["),MB_ICONERROR | MB_OK);
-		rslt = FALSE;
-		break;
-
-
-		//‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰[ƒR[ƒh
-	default:
+			rslt = TRUE;
+			break;
+
+			//‘z’肳‚ꂽƒGƒ‰[ƒR[ƒh
+		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("•ú‘—Ú‘±ƒGƒ‰["),MB_ICONERROR | MB_OK);
+			rslt = FALSE;
+			break;
+
+
+			//‘z’肳‚ê‚Ä‚¢‚È‚¢ƒGƒ‰[ƒR[ƒh
+		default:
 		
-		this->subLiveNoComboBox.AgreeInputLvNo();
-		UnexpectedErrorMessageShow( TEXT("•ú‘—Ú‘±’†‚É"),NLIB_GetErrorMessage(code),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__));
-		rslt = FALSE;
+			this->subLiveNoComboBox.AgreeInputLvNo();
+			UnexpectedErrorMessageShow( TEXT("•ú‘—Ú‘±’†‚É"),NLIB_GetErrorMessage(code),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__));
+			rslt = FALSE;
 		
-		break;
+			break;
+
+		}
+	} catch(nlib::Exception &e){
+
+		UnexpectedErrorMessageShow( TEXT("•ú‘—Ú‘±’†‚É"),e.what(),e.getLineNo(),e.getFileName(),e.getFunctionName());
 
 	}