Index: trunk/src/ProcessManagement/ProcessManagement/Forms/ProtectForm.cs
===================================================================
--- trunk/src/ProcessManagement/ProcessManagement/Forms/ProtectForm.cs	(revision 436)
+++ trunk/src/ProcessManagement/ProcessManagement/Forms/ProtectForm.cs	(revision 437)
@@ -46,8 +46,7 @@
 					case 4: MessageBox.Show("ƒ��[ƒJƒ‹ƒfƒBƒXƒN‚ÅŽÀ�s‚µ‚Ä‚­‚¾‚³‚¢�B"); break;
 					case 5: MessageBox.Show("ƒGƒ‰�[‚Å‚·�B"); break;
 				}
-				this.Close();
-                Application.Exit();
+                this.Close();
             }
 
 			string s = passwordProtect1.GetLockword();
@@ -58,13 +57,11 @@
 			{
 				MessageBox.Show("ƒ�ƒbƒNƒ��[ƒh‚ª•s�³‚Å‚·�B");
 				this.Close();
-                Application.Exit();
             }
 
-            if (!getProtectInfo)
+            if (!passwordProtect1.QueryProtectInfomation())
             {
-                if (!passwordProtect1.QueryProtectInfomation()) return;
-                getProtectInfo = true;
+                this.Close();
             }
 
             // —˜—p�ó‘Ô
@@ -89,6 +86,8 @@
                     {
                         label2.Text = "‚ ‚Æ " + zan.ToString();
                         label2.Text += " “úŠÔŽŽ—p—˜—p‚ª‚Å‚«‚Ü‚·";
+                        getProtectInfo = true;
+                        s = passwordProtect1.QueryPassword();
                     }
                     else
                     {
@@ -97,10 +96,14 @@
                         if (s != String.Empty)
                         {
                             //MessageBox.Show("ƒpƒXƒ��[ƒh‚ª�Ý’è‚³‚ê‚Ä‚¢‚Ü‚·�B");
+                            getProtectInfo = true;
                             this.Close();
                         }
                         else
+                        {
                             MessageBox.Show("�»•iƒpƒXƒ��[ƒh‚ª�Ý’è‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ�B");
+                            getProtectInfo = false;
+                        }
                     }
                     break;
                 case 1: label2.Text = "ƒvƒ�ƒeƒNƒg’†"; break;
@@ -122,8 +125,6 @@
 
             // QueryProtectƒ�ƒ\ƒbƒh‚Ì–ß‚è’l‚ª0‚Åƒvƒ�ƒeƒNƒg•û–@‚ª•W�€ƒvƒ�ƒeƒNƒg‚Ì�ê�‡‚Í�AQueryPasswordƒ�ƒ\ƒbƒh‚ðŽÀ�s‚µ‚ÄƒpƒXƒ��[ƒh‚ª�Ý’è‚³‚ê‚Ä‚¢‚é‚©‚Ç‚¤‚©Šm”F‚·‚é‚Æ—Ç‚¢‚Å‚µ‚å‚¤�B
             // ƒpƒXƒ��[ƒh‚ª�Ý’è‚³‚ê‚Ä‚¢‚È‚­‚Ä�í‚ÉQueryProtectƒ�ƒ\ƒbƒh‚Ì–ß‚è’l‚ª0‚Ì�ê�‡‚ÍProFuncNET32(64).dll‚ª�³‚µ‚­‚È‚¢‰Â”\�«‚ª‚ ‚è‚Ü‚·�B
-            if (ret != 0) return;
-
         }
 
         private void ProtectForm_FormClosed(object sender, FormClosedEventArgs e)
@@ -130,13 +131,18 @@
 		{
 			// ƒvƒ�ƒeƒNƒg�î•ñ‚Ì�X�V�i•K‚¸ŽÀ�s‚µ‚Ä‚­‚¾‚³‚¢�j
 			passwordProtect1.Finish();
-		}
+            if (!getProtectInfo)
+            {
+                Application.Exit();
+            }
+            
+        }
 
-		private void button2_Click(object sender, EventArgs e)
+        private void button2_Click(object sender, EventArgs e)
 		{
 			if (passwordProtect1.SetPassword(textBox2.Text))
             {
-                textBox2.Text = String.Empty;
+                getProtectInfo = true;
                 this.Close();
             }
             else
@@ -147,7 +153,15 @@
 
         private void button1_Click(object sender, EventArgs e)
         {
-            this.Close();
+            if (!getProtectInfo)
+            {
+                MessageBox.Show("—˜—p‚Å‚«‚Ü‚¹‚ñ�B");
+                this.Close();
+            }
+            else
+            {
+                this.Close();
+            }
         }
     }
 }
\ No newline at end of file
Index: trunk/src/ProcessManagement/ProcessManagement/ProInfo32.dll
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/src/ProcessManagement/ProcessManagement/ProInfo32.dll.dat
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/src/ProcessManagement/ProcessManagement/ProInfo64.dll
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/src/ProcessManagement/ProcessManagement/ProInfo64.dll.dat
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
