Made the disclaimer page show inside the main dialog

WOA-Project · Aug 2, 2019 · d1e8dcc · d1e8dcc
1 parent 52f2bdf
commit d1e8dcc
Showing 1 changed file with 34 additions and 21 deletions.
diff --git a/USBFunctionModeSwitcher/Program.cs b/USBFunctionModeSwitcher/Program.cs
@@ -113,30 +113,11 @@ private static void ShowTaskDialog()
                     if (role.IsHost && role.HostRole.EnableVbus)
                     {
                         args.CancelClose = true;
-
-                        var newPage = new TaskDialogPage()
-                        {
-                            Title = "USB Function Mode Switcher",
-                            Text = "Switching to this mode will enable power output from the USB Type C port. This may harm your device if you plug in a charging cable or a continuum dock. In this mode NEVER plug in any charging cable, wall charger, PC USB Cable (connected to a PC) or any externally powered USB hub! We cannot be taken responsible for any damage caused by this, you have been warned!",
-                            Instruction = "Do you really want to do this?",
-                            Icon = TaskDialogStandardIcon.Warning,
-                            CustomButtonStyle = TaskDialogCustomButtonStyle.CommandLinks,
-                            AllowCancel = true,
-                            SizeToContent = true
-                        };
-
-                        TaskDialogCustomButton nobutton = newPage.CustomButtons.Add("No");
-                        TaskDialogCustomButton yesbutton = newPage.CustomButtons.Add("Yes I understand all the risks");
-
-                        yesbutton.Click += (object sender2, TaskDialogButtonClickedEventArgs args2) =>
+                        ShowDisclaimerDialog(dialog, () =>
                         {
                             handler.CurrentUSBRole = role;
-                            dialog.Close();
                             RebootDevice();
-                        };
-
-                        var innerDialog = new TaskDialog(newPage);
-                        TaskDialogButton innerResult = innerDialog.Show();
+                        });
                     }
                     else
                     {
@@ -177,6 +158,38 @@ private static void RebootDevice()
                 Process.Start("shutdown", "/r /t 10 /f");
         }
 
+        private static void ShowDisclaimerDialog(TaskDialog dialog, Action action)
+        {
+            var newPage = new TaskDialogPage()
+            {
+                Title = "USB Function Mode Switcher",
+                Text = "Switching to this mode will enable power output from the USB Type C port. This may harm your device if you plug in a charging cable or a continuum dock. In this mode NEVER plug in any charging cable, wall charger, PC USB Cable (connected to a PC) or any externally powered USB hub! We cannot be taken responsible for any damage caused by this, you have been warned!",
+                Instruction = "Do you really want to do this?",
+                Icon = TaskDialogStandardIcon.Warning,
+                CustomButtonStyle = TaskDialogCustomButtonStyle.CommandLinks,
+                AllowCancel = true,
+                SizeToContent = true
+            };
+
+            TaskDialogCustomButton nobutton = newPage.CustomButtons.Add("No");
+            TaskDialogCustomButton yesbutton = newPage.CustomButtons.Add("Yes I understand all the risks");
+
+            yesbutton.Click += (object sender2, TaskDialogButtonClickedEventArgs args2) =>
+            {
+                action();
+            };
+
+            var origpage = dialog.Page;
+
+            nobutton.Click += (object sender2, TaskDialogButtonClickedEventArgs args2) =>
+            {
+                args2.CancelClose = true;
+                dialog.Page = origpage;
+            };
+
+            dialog.Page = newPage;
+        }
+
         private static void ShowAboutDialog(TaskDialog dialog)
         {
             var newPage = new TaskDialogPage()