Fixed bug where I used filename from editor tab in upload tab.

hwiguna · Dec 9, 2014 · d8595a6 · d8595a6
1 parent 4a6f037
commit d8595a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/ArduinoProjects/Windows/ESP8266_Related/LuaUploader/SerialPort/Form1.Designer.cs b/ArduinoProjects/Windows/ESP8266_Related/LuaUploader/SerialPort/Form1.Designer.cs
diff --git a/ArduinoProjects/Windows/ESP8266_Related/LuaUploader/SerialPort/Form1.cs b/ArduinoProjects/Windows/ESP8266_Related/LuaUploader/SerialPort/Form1.cs
@@ -143,12 +143,13 @@ private void UploadButton_Click(object sender, EventArgs e)
         {
             //Open Text file
             string origFile = System.IO.File.ReadAllText(FilePathTextbox.Text);
+            string targetFileName = Path.GetFileName(FilePathTextbox.Text);
 
             string luaCode = string.Format(
                 "file.remove(\"{0}\")\r\n" +
                 "file.open(\"{0}\",\"w\")\r\n" +
                 "{1}" +
-                "file.close()\r\n", LuaFilenameTextbox.Text, WrapInWriteLine(origFile));
+                "file.close()\r\n", targetFileName, WrapInWriteLine(origFile));
 
             SendLines(luaCode);
         }

diff --git a/ArduinoProjects/Windows/ESP8266_Related/LuaUploader/SerialPort/Form1.resx b/ArduinoProjects/Windows/ESP8266_Related/LuaUploader/SerialPort/Form1.resx
@@ -144,4 +144,7 @@ end)</value>
   <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>157, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>293, 17</value>
+  </metadata>
 </root>
diff --git a/ArduinoProjects/Windows/ESP8266_Related/LuaUploader_1.0.2.1.zip b/ArduinoProjects/Windows/ESP8266_Related/LuaUploader_1.0.2.1.zip