[PC-BSD Commits] r2767 - pcbsd/trunk/PCInstall

[svn at pcbsd.org]

Author: kris
Date: 2008-09-13 07:41:17 -0700 (Sat, 13 Sep 2008)
New Revision: 2767

Modified:
   pcbsd/trunk/PCInstall/pcinstall.cpp
Log:

Fixed bug when doing CD installs and using a language other than english, install the language pack from
CD3 now



Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp	2008-09-13 14:19:30 UTC (rev 2766)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp	2008-09-13 14:41:17 UTC (rev 2767)
@@ -2993,7 +2993,7 @@
       AddLangFiles->addArgument( "/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh" );
       AddLangFiles->addArgument( tmp );
       
-      connect( AddLangFiles, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD2()) );
+      connect( AddLangFiles, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3()) );
       connect( AddLangFiles, SIGNAL(readyReadStdout()), this, SLOT(readLangInstallSlot() ) );
 
          if ( !AddLangFiles->start() ) {
@@ -3046,7 +3046,13 @@
       InstallComponentsProc->addArgument( "/usr/local/pcbsd/scripts/PCBSD.InstallCD3.sh" );
       
       // connect our slots
-      connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3() ) );
+     if ( listBoxLang->currentItem() != 0 )
+     {
+        connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotRunInstallLangCD() ) );
+      } else {
+        connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3() ) );
+      }
+
       connect( InstallComponentsProc, SIGNAL(readyReadStdout()), this, SLOT(readInstallComponentSlot() ) );
 
          if ( !InstallComponentsProc->start() ) {
@@ -3257,12 +3263,7 @@
 	installCD2proc->addArgument("SERVER");
     }
 
-    if ( listBoxLang->currentItem() != 0 )
-    {
-        connect( installCD2proc, SIGNAL(processExited()), this, SLOT(slotRunInstallLangCD() ) );
-    } else {
-        connect( installCD2proc, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD2() ) );
-    }
+     connect( installCD2proc, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD2() ) );
 
      connect( installCD2proc, SIGNAL(readyReadStdout()), this, SLOT(slotReadCD2Status() ) );
     
@@ -3279,7 +3280,7 @@
 void PCInstall::slotFinishedInstallCD2()
 {
       // Check if we need to proceede to CD3 now and load the optional stuff
-      if ( installComponents == 1 )
+      if ( installComponents == 1 || listBoxLang->currentItem() != 0 )
       {
          if ( usingDVDmedia == 0 )
          {