[gnome-boxes] wizard: skipping Review page should still run through review()



commit a5b7525f1f04a2bf5e00a3b61415586e8261c5ea
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Wed Sep 5 12:26:02 2012 +0200

    wizard: skipping Review page should still run through review()
    
    During review(), the VM is now created. We can't skip that step from
    Setup page entirely anymore. This is part of fixing running boxes from
    command line with "gnome-boxes live.iso".
    
    https://bugzilla.gnome.org/show_bug.cgi?id=683417

 src/wizard.vala |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/src/wizard.vala b/src/wizard.vala
index 2ab127c..0a06132 100644
--- a/src/wizard.vala
+++ b/src/wizard.vala
@@ -426,15 +426,18 @@ private class Boxes.Wizard: Boxes.UI {
             page == Boxes.WizardPage.PREPARATION)
             skip_to = page - 1;
 
-        if (vm_creator != null && page == Boxes.WizardPage.SETUP)
+        if (vm_creator != null) {
             // Skip SETUP page if installer media doesn't need it
-            if (!vm_creator.install_media.need_user_input_for_vm_creation) {
-                skip_to = forwards ? page + 1 : page - 1;
-
-                // Also skip review for live media if told to do so
-                if (vm_creator.install_media.live && forwards && skip_review_for_live)
+            if (page == Boxes.WizardPage.SETUP &&
+                !vm_creator.install_media.need_user_input_for_vm_creation)
+                    skip_to = forwards ? page + 1 : page - 1;
+
+            // Skip review for live media if told to do so
+            if (page == Boxes.WizardPage.REVIEW && forwards
+                && vm_creator.install_media.live
+                && skip_review_for_live)
                     skip_to += 1;
-            }
+        }
 
         if (skip_to != page) {
             this.page = skip_to;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]