Index: main.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/main.cc,v
retrieving revision 2.32
diff -u -p -r2.32 main.cc
--- main.cc	29 Aug 2004 16:59:40 -0000	2.32
+++ main.cc	9 Oct 2004 00:56:10 -0000
@@ -435,21 +435,7 @@ main (int argc, char **argv)
     theLog->setFile (LOG_BABBLE, local_dir + "/setup.log.full", false);
     theLog->setFile (0, local_dir + "/setup.log", true);
 
-    log (LOG_PLAIN) << "Starting cygwin install, version " << version << endLog;
-
-    UserSettings::Instance().loadAllSettings();
-
-    SplashPage Splash;
-    AntiVirusPage AntiVirus;
-    SourcePage Source;
-    RootPage Root;
-    LocalDirPage LocalDir;
-    NetPage Net;
-    SitePage Site;
-    ChooserPage Chooser;
-    DesktopSetupPage Desktop;
-    PropSheet MainWindow;
-
+    log (LOG_PLAIN) << "Starting cygwin install, version " << version << endLog;    
     log (LOG_TIMESTAMP) << "Current Directory: " << local_dir << endLog;
 
     // TODO: make an equivalent for __argv under cygwin.
@@ -472,6 +458,19 @@ main (int argc, char **argv)
       theLog->exit(1);
     // #endif
 
+    UserSettings::Instance().loadAllSettings();
+
+    SplashPage Splash;
+    AntiVirusPage AntiVirus;
+    SourcePage Source;
+    RootPage Root;
+    LocalDirPage LocalDir;
+    NetPage Net;
+    SitePage Site;
+    ChooserPage Chooser;
+    DesktopSetupPage Desktop;
+    PropSheet MainWindow;
+    
     if (HelpOption)
     {
       GetOption::GetInstance().ParameterUsage(log(LOG_PLAIN)<<"\nCommand Line Options:\n");
Index: source.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/source.cc,v
retrieving revision 2.16
diff -u -p -r2.16 source.cc
--- source.cc	30 Jul 2003 08:44:51 -0000	2.16
+++ source.cc	9 Oct 2004 00:56:11 -0000
@@ -85,15 +85,12 @@ SourcePage::Create ()
 void
 SourcePage::OnActivate ()
 {
-  if (!source)
-    {
       if (DownloadOption) 
 	source = IDC_SOURCE_DOWNLOAD;
       else if (LocalOption)
 	source = IDC_SOURCE_CWD;
-      else
+      else if (!source)
 	source = IDC_SOURCE_NETINST;
-    }
 
   load_dialog (GetHWND ());
   // Check to see if any radio buttons are selected. If not, select a default.