From a9f852d5c5577c8a62a065db7982dfd0797eba81 Mon Sep 17 00:00:00 2001
From: gambas <g4mba5@gmail.com>
Date: Fri, 4 May 2018 18:54:34 +0200
Subject: [PATCH] Farm client: Compile the project before publishing it, so
 that the project version is accurate in the case it is read from a VERSION
 file.

[DEVELOPMENT ENVIRONMENT]
* BUG: Farm client: Compile the project before publishing it, so that the project version is accurate in the case it is read from a VERSION file.
* BUG: Property sheet button icon is now different from project properties button icon.
---
 app/src/gambas3/.src/Debug/FDebugInfo.class         | 1 -
 app/src/gambas3/.src/FMain.form                     | 4 ++--
 app/src/gambas3/.src/Project/Farm/FarmRequest.class | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.class b/app/src/gambas3/.src/Debug/FDebugInfo.class
index 104948084..6ebf18f6e 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.class
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.class
@@ -1091,7 +1091,6 @@ End
 Public Sub RemoveAllBreakpoints()
   
   Dim aBreakPoint As String[]
-  Dim I As Integer
   
   aBreakpoint = Design.GetBreakpoints()
   While aBreakpoint.Count
diff --git a/app/src/gambas3/.src/FMain.form b/app/src/gambas3/.src/FMain.form
index b79b10562..653d54709 100644
--- a/app/src/gambas3/.src/FMain.form
+++ b/app/src/gambas3/.src/FMain.form
@@ -920,7 +920,7 @@
       Visible = False
       ToolTip = ("Properties sheet")
       Action = "property"
-      Picture = Picture["icon:/small/edit"]
+      Picture = Picture["icon:/small/properties"]
       Toggle = True
     }
     { ToolButton10 ToolButton
@@ -1586,7 +1586,7 @@
   { Action property
     Text = "Properties"
     Shortcut = "F4"
-    Picture = "icon:/small/edit"
+    Picture = "icon:/small/properties"
   }
   { Action publish
     Text = "Publish"
diff --git a/app/src/gambas3/.src/Project/Farm/FarmRequest.class b/app/src/gambas3/.src/Project/Farm/FarmRequest.class
index 8312f4044..8400b0123 100644
--- a/app/src/gambas3/.src/Project/Farm/FarmRequest.class
+++ b/app/src/gambas3/.src/Project/Farm/FarmRequest.class
@@ -235,6 +235,8 @@ Public Sub PublishSoftware(sVendor As String, sScreenshot As String, sGambasVers
   Dim sLang As String
   Dim sSave As String
   
+  If Project.Compile(True) Then Return
+  
   $sTitle = ("Publish project")
   $iProgress = PROGRESS_UPLOAD