released ZScreen r3057

fixed bug: copying same file to a Shared Folder would cause ZScreen crash fixed bug: update check prompted even after turning off the checkBox
ShareX · May 13, 2012 · a677c3c · a677c3c
1 parent 7fbcb6c
commit a677c3c
Show file tree

Hide file tree

Showing 39 changed files with 44 additions and 42 deletions.
diff --git a/CodeWorks/CodeWorks/Properties/AssemblyInfo.cs b/CodeWorks/CodeWorks/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Crop2/Crop2/Properties/AssemblyInfo.cs b/Crop2/Crop2/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Crop2/CropTest/Properties/AssemblyInfo.cs b/Crop2/CropTest/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/DavuxLibMin/Properties/AssemblyInfo.cs b/DavuxLibMin/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/DavuxLibMin/Test/Test/Properties/AssemblyInfo.cs b/DavuxLibMin/Test/Test/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/FreeImageNetLib/Properties/AssemblyInfo.cs b/FreeImageNetLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/GraphicsManagerLib/Properties/AssemblyInfo.cs b/GraphicsManagerLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/HistoryLib/Properties/AssemblyInfo.cs b/HistoryLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("3.36.17.0")]
diff --git a/ImageEffectsLib/ImagAdjustments/Properties/AssemblyInfo.cs b/ImageEffectsLib/ImagAdjustments/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ImageEffectsLib/ImageFilters/Properties/AssemblyInfo.cs b/ImageEffectsLib/ImageFilters/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ImageEffectsLib/ImageManipulation/Properties/AssemblyInfo.cs b/ImageEffectsLib/ImageManipulation/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ImageEffectsLib/ImageQueue/Properties/AssemblyInfo.cs b/ImageEffectsLib/ImageQueue/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ImageEffectsLib/Plugins/Properties/AssemblyInfo.cs b/ImageEffectsLib/Plugins/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/JBird/Properties/AssemblyInfo.cs b/JBird/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0")]
diff --git a/Lib/Greenshot/AssemblyInfo.cs b/Lib/Greenshot/AssemblyInfo.cs
@@ -47,4 +47,4 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
diff --git a/Lib/GreenshotInterop/Properties/AssemblyInfo.cs b/Lib/GreenshotInterop/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Lib/GreenshotPlugin/Properties/AssemblyInfo.cs b/Lib/GreenshotPlugin/Properties/AssemblyInfo.cs
@@ -49,4 +49,4 @@
 //
 // You can specify all the values or you can use the default the Revision and
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("0.9.0.3051")]
+[assembly: AssemblyVersion("0.9.0.3057")]
diff --git a/MarshalTest/MarshalTest/Properties/AssemblyInfo.cs b/MarshalTest/MarshalTest/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MyColorsTest/MyColorsTest/Properties/AssemblyInfo.cs b/MyColorsTest/MyColorsTest/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ScreenCapture.Shapes/Properties/AssemblyInfo.cs b/ScreenCapture.Shapes/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.3051")]
+[assembly: AssemblyVersion("2.0.0.3057")]
 [assembly: AssemblyFileVersion("2.0.0.0")]
diff --git a/ScreenCapture/Properties/AssemblyInfo.cs b/ScreenCapture/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ScreenCaptureTest/ScreenCaptureTest/Properties/AssemblyInfo.cs b/ScreenCaptureTest/ScreenCaptureTest/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Update.xml b/Update.xml
@@ -24,9 +24,9 @@
       <Summary>http://zscreen.googlecode.com/svn/trunk/ZScreenLib/Documents/VersionHistory.txt</Summary>
     </Stable>
     <Beta>
-      <Version>4.9.0.3042</Version>
-      <URL>http://zscreen.googlecode.com/files/ZScreen-4.9.0.3042-dev-setup.exe</URL>
-      <Date>2012-03-19</Date>
+      <Version>4.9.0.3057</Version>
+      <URL>http://zscreen.googlecode.com/files/ZScreen-4.9.0.3057-dev-setup.exe</URL>
+      <Date>2012-05-12</Date>
       <Summary>http://zscreen.googlecode.com/svn/trunk/ZScreenLib/Documents/VersionHistory.txt</Summary>
     </Beta>
     <Dev>

diff --git a/ZSS.Colors/Properties/AssemblyInfo.cs b/ZSS.Colors/Properties/AssemblyInfo.cs
@@ -56,5 +56,5 @@ You should have received a copy of the GNU General Public License
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.3051")]
+[assembly: AssemblyVersion("3.0.0.3057")]
 [assembly: AssemblyFileVersion("3.0.0.0")]
diff --git a/ZSS.FTPClientLib/Properties/AssemblyInfo.cs b/ZSS.FTPClientLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.3051")]
+[assembly: AssemblyVersion("3.0.0.3057")]
 [assembly: AssemblyFileVersion("3.11.0.0")]
diff --git a/ZSS.HelpersLib/Properties/AssemblyInfo.cs b/ZSS.HelpersLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ZSS.ImageEditorLib/Properties/AssemblyInfo.cs b/ZSS.ImageEditorLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("0.7.009.0")]
diff --git a/ZSS.IndexersLib/Properties/AssemblyInfo.cs b/ZSS.IndexersLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.3051")]
+[assembly: AssemblyVersion("3.0.0.3057")]
 [assembly: AssemblyFileVersion("3.0.0.0")]
diff --git a/ZSS.ResourcesLib/Properties/AssemblyInfo.cs b/ZSS.ResourcesLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("3.36.17.0")]
diff --git a/ZScreen/Forms/ZScreenOptionalTasks.cs b/ZScreen/Forms/ZScreenOptionalTasks.cs
@@ -107,8 +107,10 @@ private void bwOnlineTasks_DoWork(object sender, DoWorkEventArgs e)
                 {
                     Adapter.TestFTPAccount(acc, true);
                 }
-
-                CheckUpdate();
+                if (Engine.ConfigUI.CheckUpdates)
+                {
+                    CheckUpdate();
+                }
             }
             catch (Exception ex)
             {

diff --git a/ZScreen/Properties/AssemblyInfo.cs b/ZScreen/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@ You should have received a copy of the GNU General Public License
 //      Minor Version
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("4.9.0.3051")]
+[assembly: AssemblyVersion("4.9.0.3057")]
 [assembly: AssemblyFileVersion("4.9.0")]
diff --git a/ZScreenCoreLib/Properties/AssemblyInfo.cs b/ZScreenCoreLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ZScreenLib/Helpers/WorkerTask.cs b/ZScreenLib/Helpers/WorkerTask.cs
@@ -2056,7 +2056,7 @@ public void UploadToSharedFolder(int id)
                     {
                         Directory.CreateDirectory(destDir);
                     }
-                    File.Copy(Info.LocalFilePath, destFile);
+                    File.Copy(Info.LocalFilePath, destFile, true);
                     UpdateLocalFilePath(destFile);
                 }
                 else if (TempImage != null)

diff --git a/ZScreenLib/Properties/AssemblyInfo.cs b/ZScreenLib/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("4.9.0.3051")]
+[assembly: AssemblyVersion("4.9.0.3057")]
 [assembly: AssemblyFileVersion("4.9.0")]
diff --git a/ZScreenTester/GradientTester/Properties/AssemblyInfo.cs b/ZScreenTester/GradientTester/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.3051")]
+[assembly: AssemblyVersion("3.0.0.3057")]
 [assembly: AssemblyFileVersion("3.0.0.0")]
diff --git a/ZScreenTester/ZScreenFTPClientTester/Properties/AssemblyInfo.cs b/ZScreenTester/ZScreenFTPClientTester/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.3051")]
+[assembly: AssemblyVersion("1.0.0.3057")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ZScreenTester/ZScreenTesterCLI/Properties/AssemblyInfo.cs b/ZScreenTester/ZScreenTesterCLI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.2.3051")]
+[assembly: AssemblyVersion("3.3.2.3057")]
 [assembly: AssemblyFileVersion("3.3.2.0")]
diff --git a/ZScreenTester/ZScreenTesterGUI/Properties/AssemblyInfo.cs b/ZScreenTester/ZScreenTesterGUI/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.3051")]
+[assembly: AssemblyVersion("3.0.0.3057")]
 [assembly: AssemblyFileVersion("3.11.0.0")]
diff --git a/ZUploader/Properties/AssemblyInfo.cs b/ZUploader/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.5.0.3051")]
+[assembly: AssemblyVersion("5.5.0.3057")]
 [assembly: AssemblyFileVersion("5.5.0")]