fix manual ride entry crash when no zones file

This is a partial patch based on code from Eric Murray.  It changes just
enough of ManyalRideDialog to fix a crash that otherwise occurs when the
user doesn't have a zones file.

src/ManualRideDialog.cpp

@@ -226,11 +226,13 @@ ManualRideDialog::bsEstChanged()
 void
 ManualRideDialog::setBsEst()
 {
-    if (estBSbyDistButton->isChecked()) {
-	estBSFromDistance();
-    }
-    else {
-	estBSFromTime();
+    if (estBSbyDistButton) {
+        if (estBSbyDistButton->isChecked()) {
+            estBSFromDistance();
+        }
+        else {
+            estBSFromTime();
+        }
     }
 }
 

src/RideFile.cpp

@@ -112,12 +112,12 @@ void RideFile::writeAsCsv(QFile &file, bool bIsMetric) const
     QTextStream out(&file);
     if (!bIsMetric)
     {
-        out << "Minutes,Torq (N-m),MPH,Watts,Miles,Cadence,Hrate,Altitude (feet),ID\n";
+        out << "Minutes,Torq (N-m),MPH,Watts,Miles,Cadence,Hrate,ID,Altitude (feet)\n";
         const double MILES_PER_KM = 0.62137119;
         convertUnit = MILES_PER_KM;
     }
     else {
-        out << "Minutes,Torq (N-m),Km/h,Watts,Km,Cadence,Hrate,Altitude (feet),ID\n";
+        out << "Minutes,Torq (N-m),Km/h,Watts,Km,Cadence,Hrate,ID,Altitude (m)\n";
         // TODO: use KM_TO_MI from lib/pt.c instead?
         convertUnit = 1.0;
     }
@@ -141,9 +141,9 @@ void RideFile::writeAsCsv(QFile &file, bool bIsMetric) const
         out << ",";
         out << point->hr;
         out << ",";
-        out << point->alt;
-        out << ",";
         out << point->interval;
+        out << ",";
+        out << point->alt;
         if (point->bs > 0.0) {
         	out << ",";
 		out << point->bs;

src/WkoRideFile.cpp

@@ -1095,6 +1095,7 @@ unsigned int optpad2(WKO_UCHAR *p)
     case 0x8016 :
     case 0x8015 :
     case 0x8011 :
+    case 0x8012 : // new (but rare) 11.09.2009
     case 0x8010 :
 
         bytes += 16;