--- a/src/FingersDance/MainSurfaceWindow.xaml.cs	Mon Oct 05 18:29:32 2009 +0200
+++ b/src/FingersDance/MainSurfaceWindow.xaml.cs	Mon Oct 05 19:10:28 2009 +0200
@@ -232,7 +232,7 @@
             switch ((int)sender)
             {
                 case 1:
-                    if (Panel1 == null)
+                    if (Panel1 == null && Grid1.Children.Count == 1)
                     {
                         //1-Creation du control Screen
                         UserControlScreen Screen = new UserControlScreen(1);
@@ -245,14 +245,17 @@
                     }
                     else //Affichage du message de confirmation
                     {
-                        UserControlClose UCclose = new UserControlClose(1);
-                        UCclose.Name = "CloseAlert1";
-                        Grid1.Children.Add(UCclose);
-                        UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+                        if (Panel1 != null && Grid1.Children.Count == 2)
+                        {
+                            UserControlClose UCclose = new UserControlClose(1);
+                            UCclose.Name = "CloseAlert1";
+                            Grid1.Children.Add(UCclose);
+                            UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+                        }
                     }
                     break;
                 case 2:
-                    if (Panel2 == null)
+                    if (Panel2 == null && Grid2.Children.Count == 1)
                     {
                         //1-Creation du control Screen
                         UserControlScreen Screen = new UserControlScreen(2);
@@ -265,14 +268,17 @@
                     }
                     else //Affichage du message de confirmation
                     {
-                        UserControlClose UCclose = new UserControlClose(2);
-                        UCclose.Name = "CloseAlert2";
-                        Grid2.Children.Add(UCclose);
-                        UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+                        if (Panel2 != null && Grid2.Children.Count == 2)
+                        {
+                            UserControlClose UCclose = new UserControlClose(2);
+                            UCclose.Name = "CloseAlert2";
+                            Grid2.Children.Add(UCclose);
+                            UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+                        }
                     }
                     break;
                 case 3:
-                    if (Panel3 == null)
+                    if (Panel3 == null && Grid3.Children.Count == 1)
                     {
                         //1-Creation du control Screen
                         UserControlScreen Screen = new UserControlScreen(3);
@@ -285,14 +291,17 @@
                     }
                     else //Affichage du message de confirmation
                     {
-                        UserControlClose UCclose = new UserControlClose(3);
-                        UCclose.Name = "CloseAlert3";
-                        Grid3.Children.Add(UCclose);
-                        UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+                        if (Panel3 != null && Grid3.Children.Count == 2)
+                        {
+                            UserControlClose UCclose = new UserControlClose(3);
+                            UCclose.Name = "CloseAlert3";
+                            Grid3.Children.Add(UCclose);
+                            UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+                        }
                     }
                     break;
                 case 4:
-                    if (Panel4 == null)
+                    if (Panel4 == null && Grid4.Children.Count == 1)
                     {
                         //1-Creation du control Screen
                         UserControlScreen Screen = new UserControlScreen(4);
@@ -305,10 +314,13 @@
                     }
                     else //Affichage du message de confirmation
                     {
-                        UserControlClose UCclose = new UserControlClose(4);
-                        UCclose.Name = "CloseAlert4";
-                        Grid4.Children.Add(UCclose);
-                        UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+                        if (Panel4 != null && Grid4.Children.Count == 2)
+                        {
+                            UserControlClose UCclose = new UserControlClose(4);
+                            UCclose.Name = "CloseAlert4";
+                            Grid4.Children.Add(UCclose);
+                            UCclose.EH_SurfaceButtonClose_ContactDown += new EventHandler(CloseAlert_EH_SurfaceButton_ContactDown);
+                        }
                     }
                     break;
             }
@@ -365,15 +377,19 @@
                 {
                     case 1:
                         root.Children.Remove(Panel1);
+                        Panel1 = null;
                         break;
                     case 2:
                         root.Children.Remove(Panel2);
+                        Panel2 = null;
                         break;
                     case 3:
                         root.Children.Remove(Panel3);
+                        Panel3 = null;
                         break;
                     case 4:
                         root.Children.Remove(Panel4);
+                        Panel4 = null;
                         break;
                 }
             }