Merge pull request #225 from farmerbriantee/Development

Development
farmerbriantee · Nov 8, 2021 · ee0c12c · ee0c12c
2 parents cc91f94 + ef3752f
commit ee0c12c
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 9 deletions.
diff --git a/SourceCode/GPS/Forms/FormSaveAs.Designer.cs b/SourceCode/GPS/Forms/FormSaveAs.Designer.cs
diff --git a/SourceCode/GPS/Forms/FormSaveAs.cs b/SourceCode/GPS/Forms/FormSaveAs.cs
@@ -73,8 +73,8 @@ private void btnSave_Click(object sender, EventArgs e)
             mf.currentFieldDirectory = tboxFieldName.Text.Trim() + " ";
 
             //date
-            mf.currentFieldDirectory += " " + DateTime.Now.ToString("MMM.dd", CultureInfo.InvariantCulture);
-            mf.currentFieldDirectory += " " + DateTime.Now.ToString("HH_mm", CultureInfo.InvariantCulture);
+            if (cboxAddDate.Checked) mf.currentFieldDirectory += " " + DateTime.Now.ToString("MMM.dd", CultureInfo.InvariantCulture);
+            if (cboxAddTime.Checked) mf.currentFieldDirectory += " " + DateTime.Now.ToString("HH_mm", CultureInfo.InvariantCulture);
 
             //get the directory and make sure it exists, create if not
             string dirNewField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";

diff --git a/SourceCode/GPS/Forms/Pickers/FormFilePicker.cs b/SourceCode/GPS/Forms/Pickers/FormFilePicker.cs
@@ -92,6 +92,7 @@ private void FormFilePicker_Load(object sender, EventArgs e)
                         }
                     }
                 }
+                else continue;
 
                 //grab the boundary area
                 filename = dir + "\\Boundary.txt";

diff --git a/SourceCode/GPS/Forms/SaveOpen.Designer.cs b/SourceCode/GPS/Forms/SaveOpen.Designer.cs