Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DC_7C
						commit
						6f4a98f26a
					
				|  | @ -11020,6 +11020,7 @@ namespace INT69DC_7C.Forms | ||||||
|                     if (null == strRecvMsg) |                     if (null == strRecvMsg) | ||||||
|                     { |                     { | ||||||
|                         this.DelegateTextStatusOut(">Server Out"); |                         this.DelegateTextStatusOut(">Server Out"); | ||||||
|  |                         this.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetDisconnect, "Client"); | ||||||
|                         this.IsEthernetThreadStop = true; |                         this.IsEthernetThreadStop = true; | ||||||
|                         break; |                         break; | ||||||
|                     } |                     } | ||||||
|  |  | ||||||
|  | @ -979,6 +979,7 @@ namespace INT69DC_7C.Forms | ||||||
|                 this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; |                 this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; | ||||||
| 
 | 
 | ||||||
|                 this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; |                 this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; | ||||||
|  |                 this.ParentForm.SystemConfig.CurrentUser.IsFirstPassword = userInfo.fFirstPW; | ||||||
|                 #endregion |                 #endregion | ||||||
| 
 | 
 | ||||||
|                 this.UI_Invoke(delegate |                 this.UI_Invoke(delegate | ||||||
|  | @ -1014,7 +1015,6 @@ namespace INT69DC_7C.Forms | ||||||
|             } |             } | ||||||
|             else if (result == DialogResult.Abort) |             else if (result == DialogResult.Abort) | ||||||
|             { |             { | ||||||
| 
 |  | ||||||
|                 // 비밀 번호 변경 띄우기 |                 // 비밀 번호 변경 띄우기 | ||||||
|                 DialogFormLogOn logOn1 = new DialogFormLogOn(this.ParentForm, false, true); |                 DialogFormLogOn logOn1 = new DialogFormLogOn(this.ParentForm, false, true); | ||||||
|                 if (logOn1.ShowDialog() == DialogResult.OK) |                 if (logOn1.ShowDialog() == DialogResult.OK) | ||||||
|  | @ -2439,6 +2439,7 @@ namespace INT69DC_7C.Forms | ||||||
|                     this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; |                     this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; | ||||||
| 
 | 
 | ||||||
|                     this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; |                     this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; | ||||||
|  |                     this.ParentForm.SystemConfig.CurrentUser.IsFirstPassword = userInfo.fFirstPW; | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue