Fix image ifecycle for user details editor

MoyaSignup/TakePictureControl.cs

@@ -51,6 +51,7 @@ namespace MoyaSignup
 
 
         public void loadUserImage(User user)
         public void loadUserImage(User user)
         {
         {
+            pbIncoming.Image?.Dispose();
             PictureTaken = false;
             PictureTaken = false;
             if (user.UserId == 0)
             if (user.UserId == 0)
                 return;
                 return;
@@ -62,7 +63,8 @@ namespace MoyaSignup
                 {
                 {
                     using (Stream stream = response.GetResponseStream())
                     using (Stream stream = response.GetResponseStream())
                     {
                     {
-                        pbIncoming.Image = Bitmap.FromStream(stream);
+                        pbIncoming.Image = Image.FromStream(stream);
+                        pbIncoming.Update();
                     }
                     }
                 }
                 }
 
 

MoyaSignup/UserDetailsEditor.Designer.cs

@@ -285,7 +285,6 @@
             this.lblMessage.Name = "lblMessage";
             this.lblMessage.Name = "lblMessage";
             this.lblMessage.Size = new System.Drawing.Size(555, 73);
             this.lblMessage.Size = new System.Drawing.Size(555, 73);
             this.lblMessage.TabIndex = 23;
             this.lblMessage.TabIndex = 23;
-            this.lblMessage.Text = "label3";
             this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
             // dateTimePickerAge
             // dateTimePickerAge

MoyaSignup/UserDetailsEditor.cs

@@ -93,7 +93,9 @@ namespace MoyaSignup
             if (user.UserId == 0) 
             if (user.UserId == 0) 
             {
             {
                 // new user
                 // new user
+                takePictureControl1.Clear();
                 takePictureControl1.TakePicture();
                 takePictureControl1.TakePicture();
+                lblMessage.Text = "";
                 txtFirstName.ReadOnly = false;
                 txtFirstName.ReadOnly = false;
                 txtLastName.ReadOnly = false;
                 txtLastName.ReadOnly = false;
                 txtNick.ReadOnly = false;
                 txtNick.ReadOnly = false;
@@ -125,12 +127,12 @@ namespace MoyaSignup
             {
             {
                 // old user
                 // old user
                 takePictureControl1.loadUserImage(user);
                 takePictureControl1.loadUserImage(user);
+                lblMessage.Text = "Voit pyytää muutoksia tietoihin infotiskillä";
                 btnSaveData.Text = "Tallenna kuva ja tulosta lipputosite";
                 btnSaveData.Text = "Tallenna kuva ja tulosta lipputosite";
                 btnSaveData.Visible = true;
                 btnSaveData.Visible = true;
             } 
             } 
                
                
             currentUser = user;
             currentUser = user;
-            lblMessage.Text = "Voit pyytää muutoksia tietoihin infotiskillä";
         }
         }
 
 
 
 
@@ -213,8 +215,8 @@ namespace MoyaSignup
 
 
         private void UserDetailsEditor_Load(object sender, EventArgs e)
         private void UserDetailsEditor_Load(object sender, EventArgs e)
         {
         {
-            lblMessage.Text = "";
-            takePictureControl1.Clear();
+            //lblMessage.Text = "";
+            //takePictureControl1.Clear();
             takePictureControl1.Changed += takePictureControl1_Changed;
             takePictureControl1.Changed += takePictureControl1_Changed;
             //if(Debugger.IsAttached)
             //if(Debugger.IsAttached)
              //   btnSaveData.Visible = true;
              //   btnSaveData.Visible = true;